OSDN -- Develop and Download Open Source Software

[Ttssh2-commit] [9019] ttftypes.h への依存を減らした

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2020年 11月 2日 (月) 00:41:19 JST 

Revision: 9019
          https://osdn.net/projects/ttssh2/scm/svn/commits/9019
Author:   zmatsuo
Date:     2020-11-02 00:41:19 +0900 (Mon, 02 Nov 2020)
Log Message:
-----------
ttftypes.h への依存を減らした

- 不要な ttftypes.h の include を削除
- logダイアログのタイトルを filesys_log.cpp へ移動
  - FILEDLG_TRANS_TITLE_LOGのデフォルト値
- ファイル送信ダイアログのタイトルを sendfiledlg.cpp へ移動
  - FILEDLG_TRANS_TITLE_SENDFILEのデフォルト値

Modified Paths:
--------------
    branches/proto_unicode/teraterm/common/ttftypes.h
    branches/proto_unicode/teraterm/teraterm/filesys.cpp
    branches/proto_unicode/teraterm/teraterm/filesys_log.cpp
    branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
    branches/proto_unicode/teraterm/teraterm/protodlg.cpp
    branches/proto_unicode/teraterm/teraterm/sendfiledlg.cpp
    branches/proto_unicode/teraterm/teraterm/sendmem.cpp
    branches/proto_unicode/teraterm/teraterm/ttdde.c
    branches/proto_unicode/teraterm/teraterm/vtterm.c
    branches/proto_unicode/teraterm/ttpfile/bplus.c
    branches/proto_unicode/teraterm/ttpfile/ftlib.c
    branches/proto_unicode/teraterm/ttpfile/kermit.c
    branches/proto_unicode/teraterm/ttpfile/quickvan.c
    branches/proto_unicode/teraterm/ttpfile/ymodem.c
    branches/proto_unicode/teraterm/ttpfile/zmodem.c

-------------- next part --------------
Modified: branches/proto_unicode/teraterm/common/ttftypes.h
===================================================================
--- branches/proto_unicode/teraterm/common/ttftypes.h	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/common/ttftypes.h	2020-11-01 15:41:19 UTC (rev 9019)
@@ -36,6 +36,3 @@
 #define PROTO_BP  4
 #define PROTO_QV  5
 #define PROTO_YM  6
-
-#define TitLog      "Log"
-#define TitSendFile "Send file"

Modified: branches/proto_unicode/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/filesys.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -37,7 +37,6 @@
 
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include "ftdlg.h"
 #include "ttwinman.h"
 #include "commlib.h"

Modified: branches/proto_unicode/teraterm/teraterm/filesys_log.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_log.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/filesys_log.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -40,7 +40,6 @@
 
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include "ftdlg.h"
 #include "ttwinman.h"
 #include "commlib.h"
@@ -60,6 +59,8 @@
 #include "filesys_log.h"
 #include "filesys.h"  // for ProtoGetProtoFlag()
 
+#define TitLog      L"Log"
+
 /*
    Line Head flag for timestamping
    2007.05.24 Gentaro
@@ -135,8 +136,7 @@
 
 	wchar_t *DlgCaption;
 	wchar_t uimsg[MAX_UIMSG];
-#define TitLogW      L"Log"
-	get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLogW, ts.UILanguageFile);
+	get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLog, ts.UILanguageFile);
 	aswprintf(&DlgCaption, L"Tera Term: %s", uimsg);
 
 	CFileTransDlg::Info info;
@@ -590,8 +590,7 @@
 
 			wchar_t caption[MAX_PATH];
 			wchar_t uimsg[MAX_UIMSG];
-#define TitLogW      L"Log"
-			get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLogW, UILanguageFile);
+			get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLog, UILanguageFile);
 			wcsncpy_s(caption, _countof(caption), L"Tera Term: ", _TRUNCATE);
 			wcsncat_s(caption, _countof(caption), uimsg, _TRUNCATE);
 

Modified: branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ftdlg.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/ftdlg.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -36,7 +36,6 @@
 
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include "ttlib.h"
 #include "dlglib.h"
 #include "tt_res.h"

Modified: branches/proto_unicode/teraterm/teraterm/protodlg.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/protodlg.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/protodlg.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -31,7 +31,6 @@
 #include "teraterm.h"
 #include "tt_res.h"
 #include "tttypes.h"
-//#include "ttftypes.h"
 #include "ttlib.h"
 #include "dlglib.h"
 #include "protodlg.h"

Modified: branches/proto_unicode/teraterm/teraterm/sendfiledlg.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/sendfiledlg.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/sendfiledlg.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -41,12 +41,11 @@
 #include "tttypes.h"		// for WM_USER_DLGHELP2
 #include "helpid.h"
 #include "codeconv.h"
-#include "ttftypes.h"		// for TitSendFile
 #include "asprintf.h"
 
 #include "sendfiledlg.h"
 
-#define TitSendFileW L"Send file"	// TODO ttftype.h\x93\xE0\x82\xC9ANSI\x94ł\xAA\x82\xA0\x82\xE9
+#define TitSendFile L"Send file"
 
 static INT_PTR CALLBACK SendFileDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
@@ -143,7 +142,7 @@
 					wchar_t TempDir[MAX_PATH];
 					_GetCurrentDirectoryW(_countof(TempDir), TempDir);
 
-					wchar_t *uimsg = TTGetLangStrW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", TitSendFileW, data->UILanguageFile);
+					wchar_t *uimsg = TTGetLangStrW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", TitSendFile, data->UILanguageFile);
 					wchar_t *title;
 					aswprintf(&title, L"Tera Term: %s", uimsg);
 					free(uimsg);

Modified: branches/proto_unicode/teraterm/teraterm/sendmem.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/sendmem.cpp	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/sendmem.cpp	2020-11-01 15:41:19 UTC (rev 9019)
@@ -44,8 +44,7 @@
 #define	SENDMEM_USE_OLD_API	1
 
 #if SENDMEM_USE_OLD_API
-#include "ttftypes.h"		// for TFileVar
-#include "filesys.h"		// for SendVar
+#include "filesys.h"		// for FileSendStart()
 #else
 #include "fileread.h"
 #endif

Modified: branches/proto_unicode/teraterm/teraterm/ttdde.c
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ttdde.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/ttdde.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <ddeml.h>
 #include "ttwinman.h"
-#include "ttftypes.h"
 #include "filesys.h"
 #include "ttsetup.h"
 #include "telnet.h"

Modified: branches/proto_unicode/teraterm/teraterm/vtterm.c
===================================================================
--- branches/proto_unicode/teraterm/teraterm/vtterm.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/teraterm/vtterm.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -49,7 +49,6 @@
 #include "vtdisp.h"
 #include "keyboard.h"
 #include "ttlib.h"
-#include "ttftypes.h"
 #include "filesys.h"
 #include "teraprn.h"
 #include "telnet.h"

Modified: branches/proto_unicode/teraterm/ttpfile/bplus.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/bplus.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/bplus.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -30,7 +30,6 @@
 /* TTFILE.DLL, B-Plus protocol */
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include <string.h>
 #include "tt_res.h"
 

Modified: branches/proto_unicode/teraterm/ttpfile/ftlib.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/ftlib.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/ftlib.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -31,7 +31,6 @@
 
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include "ttlib.h"
 #include <stdio.h>
 #include <string.h>

Modified: branches/proto_unicode/teraterm/ttpfile/kermit.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/kermit.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/kermit.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -30,7 +30,6 @@
 /* TTFILE.DLL, Kermit protocol */
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include <stdio.h>
 #include <time.h>
 #include <string.h>

Modified: branches/proto_unicode/teraterm/ttpfile/quickvan.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/quickvan.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/quickvan.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -30,7 +30,6 @@
 /* TTFILE.DLL, Quick-VAN protocol */
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

Modified: branches/proto_unicode/teraterm/ttpfile/ymodem.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/ymodem.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/ymodem.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -35,7 +35,6 @@
 
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 
 #include "tt_res.h"
 #include "ttcommon.h"

Modified: branches/proto_unicode/teraterm/ttpfile/zmodem.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/zmodem.c	2020-11-01 15:41:02 UTC (rev 9018)
+++ branches/proto_unicode/teraterm/ttpfile/zmodem.c	2020-11-01 15:41:19 UTC (rev 9019)
@@ -45,7 +45,6 @@
 /* TTFILE.DLL, ZMODEM protocol */
 #include "teraterm.h"
 #include "tttypes.h"
-#include "ttftypes.h"
 #include <stdio.h>
 #include <stdarg.h>

Ttssh2-commit メーリングリストの案内
Back to archive index