Skip to content

Commit 96af681

Browse files
gorogoro123gorogoro123
committed
Remove _T() macro
1 parent 9c28608 commit 96af681

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎sakura_core/config/system_constants.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828

2929
//! デバッグ判別、定数サフィックス 2007.09.20 kobake
3030
#ifdef _DEBUG
31-
#define _DEBUG_SUFFIX_ "_DEBUG"
31+
#define _DEBUG_SUFFIX_ L"_DEBUG"
3232
#else
33-
#define _DEBUG_SUFFIX_ ""
33+
#define _DEBUG_SUFFIX_ L""
3434
#endif
3535

3636
//! ビルドコード判別、定数サフィックス 2007.09.20 kobake
37-
#define _CODE_SUFFIX_ "WP"
37+
#define _CODE_SUFFIX_ L"WP"
3838

3939
//! ターゲットマシン判別 2010.08.21 Moca 追加
4040
#ifdef _WIN64
41-
#define CON_SKR_MACHINE_SUFFIX_ "M64"
41+
#define CON_SKR_MACHINE_SUFFIX_ L"M64"
4242
#else
43-
#define CON_SKR_MACHINE_SUFFIX_ ""
43+
#define CON_SKR_MACHINE_SUFFIX_ L""
4444
#endif
4545

4646
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
@@ -550,8 +550,8 @@
550550
551551
*/
552552
#define N_SHAREDATA_VERSION 181
553-
#define STR_SHAREDATA_VERSION NUM_TO_STR(N_SHAREDATA_VERSION)
554-
#define GSTR_SHAREDATA (L"SakuraShareData" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
553+
#define STR_SHAREDATA_VERSION TEXT(NUM_TO_STR(N_SHAREDATA_VERSION))
554+
#define GSTR_SHAREDATA (L"SakuraShareData" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
555555

556556
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
557557
// ミューテックス //
@@ -561,42 +561,42 @@
561561
#define GSTR_MUTEX_SAKURA L"MutexSakuraEditor"
562562

563563
//! コントロールプロセス
564-
#define GSTR_MUTEX_SAKURA_CP (L"MutexSakuraEditorCP" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
564+
#define GSTR_MUTEX_SAKURA_CP (L"MutexSakuraEditorCP" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
565565

566566
//! ノーマルプロセス初期化同期
567-
#define GSTR_MUTEX_SAKURA_INIT (L"MutexSakuraEditorInit" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
567+
#define GSTR_MUTEX_SAKURA_INIT (L"MutexSakuraEditorInit" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
568568

569569
//! ノード操作同期
570-
#define GSTR_MUTEX_SAKURA_EDITARR (L"MutexSakuraEditorEditArr" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
570+
#define GSTR_MUTEX_SAKURA_EDITARR (L"MutexSakuraEditorEditArr" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
571571

572572
//DLLSHARE Work操作同期
573-
#define GSTR_MUTEX_SAKURA_SHAREWORK (L"MutexSakuraEditorShareWork" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
573+
#define GSTR_MUTEX_SAKURA_SHAREWORK (L"MutexSakuraEditorShareWork" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
574574

575575
//! 強調キーワードロック
576-
#define GSTR_MUTEX_SAKURA_KEYWORD (L"MutexSakuraEditorKeyword" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
576+
#define GSTR_MUTEX_SAKURA_KEYWORD (L"MutexSakuraEditorKeyword" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
577577

578578
//タイプ別設定転送用
579-
#define GSTR_MUTEX_SAKURA_DOCTYPE (L"MutexSakuraEditorDocType" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
579+
#define GSTR_MUTEX_SAKURA_DOCTYPE (L"MutexSakuraEditorDocType" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
580580

581581
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
582582
// イベント //
583583
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
584584

585585
//! 初期化完了イベント
586-
#define GSTR_EVENT_SAKURA_CP_INITIALIZED (L"EventSakuraEditorCPInitialized" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
586+
#define GSTR_EVENT_SAKURA_CP_INITIALIZED (L"EventSakuraEditorCPInitialized" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
587587

588588
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
589589
// ウィンドウクラス //
590590
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
591591

592592
//! コントロールトレイ
593-
#define GSTR_CEDITAPP (L"CControlTray" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
593+
#define GSTR_CEDITAPP (L"CControlTray" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
594594

595595
//! メインウィンドウ
596-
#define GSTR_EDITWINDOWNAME (L"TextEditorWindow" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))
596+
#define GSTR_EDITWINDOWNAME (L"TextEditorWindow" CON_SKR_MACHINE_SUFFIX_ _CODE_SUFFIX_ _DEBUG_SUFFIX_ STR_SHAREDATA_VERSION)
597597

598598
//! ビュー
599-
#define GSTR_VIEWNAME (L"SakuraView" _T(STR_SHAREDATA_VERSION))
599+
#define GSTR_VIEWNAME (L"SakuraView" STR_SHAREDATA_VERSION)
600600

601601
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
602602
// リソース //

‎sakura_core/debug/Debug1.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void DebugOutW( LPCWSTR lpFmt, ...);
5858

5959
//トレース出力（トレース箇所のファイルパスと行番号を出力してエラー解析を容易にする目的）
6060
#ifdef _DEBUG
61-
#define TRACE( format, ... ) DEBUG_TRACE( _T("%hs(%d): ") _T(format) _T("\n"), __FILE__, __LINE__, __VA_ARGS__ )
61+
#define TRACE( format, ... ) DEBUG_TRACE( L"%hs(%d): " TEXT(format) L"\n", __FILE__, __LINE__, __VA_ARGS__ )
6262
#else
6363
#define TRACE( ... )
6464
#endif

‎sakura_core/dlg/CDlgAbout.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,53 +52,53 @@ const DWORD p_helpids[] = { //12900
5252
// 2006.01.17 Moca COMPILER_VERを追加
5353
// 2010.04.15 Moca icc/dmcを追加しCPUを分離
5454
#if defined(_M_AMD64)
55-
# define TARGET_M_SUFFIX "_A64"
55+
# define TARGET_M_SUFFIX L"_A64"
5656
#else
57-
# define TARGET_M_SUFFIX ""
57+
# define TARGET_M_SUFFIX L""
5858
#endif
5959

6060
#if defined(__BORLANDC__)
6161
// borland c++
6262
// http://docwiki.embarcadero.com/RADStudio/Rio/en/Predefined_Macros
6363
// http://docwiki.embarcadero.com/RADStudio/Rio/en/Predefined_Macros#C.2B.2B_Compiler_Versions_in_Predefined_Macros
64-
# define COMPILER_TYPE "B"
64+
# define COMPILER_TYPE L"B"
6565
# define COMPILER_VER __BORLANDC__
6666
#elif defined(__GNUG__)
6767
// __GNUG__ = (__GNUC__ && __cplusplus)
6868
// GNU C++
6969
// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
70-
# define COMPILER_TYPE "G"
70+
# define COMPILER_TYPE L"G"
7171
# define COMPILER_VER (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
7272
#elif defined(__INTEL_COMPILER)
7373
// Intel Compiler
7474
// https://software.intel.com/en-us/cpp-compiler-developer-guide-and-reference-additional-predefined-macros
75-
# define COMPILER_TYPE "I"
75+
# define COMPILER_TYPE L"I"
7676
# define COMPILER_VER __INTEL_COMPILER
7777
#elif defined(__DMC__)
7878
// Digital Mars C/C++
7979
// https://digitalmars.com/ctg/predefined.html
80-
# define COMPILER_TYPE "D"
80+
# define COMPILER_TYPE L"D"
8181
# define COMPILER_VER __DMC__
8282
#elif defined(_MSC_VER)
8383
// https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019
84-
# define COMPILER_TYPE "V"
84+
# define COMPILER_TYPE L"V"
8585
# define COMPILER_VER _MSC_VER
8686
#else
8787
// unknown
88-
# define COMPILER_TYPE "U"
88+
# define COMPILER_TYPE L"U"
8989
# define COMPILER_VER 0
9090
#endif
9191
// To Here Feb. 7, 2002 genta
9292

93-
#define TARGET_STRING_MODEL "WP"
93+
#define TARGET_STRING_MODEL L"WP"
9494

9595
#ifdef _DEBUG
96-
#define TARGET_DEBUG_MODE "D"
96+
#define TARGET_DEBUG_MODE L"D"
9797
#else
98-
#define TARGET_DEBUG_MODE "R"
98+
#define TARGET_DEBUG_MODE L"R"
9999
#endif
100100

101-
#define TSTR_TARGET_MODE _T(TARGET_STRING_MODEL) _T(TARGET_DEBUG_MODE)
101+
#define TSTR_TARGET_MODE TARGET_STRING_MODEL TARGET_DEBUG_MODE
102102

103103
#if defined(CI_BUILD_URL)
104104
#pragma message("CI_BUILD_URL: " CI_BUILD_URL)
@@ -179,20 +179,20 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
179179

180180
// 2行目
181181
#ifdef GIT_COMMIT_HASH
182-
cmemMsg.AppendString( L"(GitHash " _T(GIT_COMMIT_HASH) L")\r\n" );
182+
cmemMsg.AppendString( L"(GitHash " TEXT(GIT_COMMIT_HASH) L")\r\n" );
183183
#endif
184184

185185
// 3行目
186186
#ifdef GIT_REMOTE_ORIGIN_URL
187-
cmemMsg.AppendString( L"(GitURL " _T(GIT_REMOTE_ORIGIN_URL) L")\r\n");
187+
cmemMsg.AppendString( L"(GitURL " TEXT(GIT_REMOTE_ORIGIN_URL) L")\r\n");
188188
#endif
189189

190190
// 段落区切り
191191
cmemMsg.AppendString( L"\r\n" );
192192

193193
// コンパイル情報
194194
cmemMsg.AppendStringF(
195-
L" Compile Info: " _T(COMPILER_TYPE) _T(TARGET_M_SUFFIX) L"%d " TSTR_TARGET_MODE L" WIN%03x/I%03x/N%03x\r\n",
195+
L" Compile Info: " COMPILER_TYPE TARGET_M_SUFFIX L"%d " TSTR_TARGET_MODE L" WIN%03x/I%03x/N%03x\r\n",
196196
COMPILER_VER, WINVER, _WIN32_IE, _WIN32_WINNT
197197
);
198198

@@ -306,20 +306,20 @@ BOOL CDlgAbout::OnStnClicked( int wID )
306306
case IDC_STATIC_URL_CI_BUILD:
307307
{
308308
#if defined(CI_BUILD_URL)
309-
::ShellExecute(GetHwnd(), nullptr, _T(CI_BUILD_URL), nullptr, nullptr, SW_SHOWNORMAL);
309+
::ShellExecute(GetHwnd(), nullptr, TEXT(CI_BUILD_URL), nullptr, nullptr, SW_SHOWNORMAL);
310310
#elif defined(GIT_REMOTE_ORIGIN_URL)
311-
::ShellExecute(GetHwnd(), nullptr, _T(GIT_REMOTE_ORIGIN_URL), nullptr, nullptr, SW_SHOWNORMAL);
311+
::ShellExecute(GetHwnd(), nullptr, TEXT(GIT_REMOTE_ORIGIN_URL), nullptr, nullptr, SW_SHOWNORMAL);
312312
#endif
313313
return TRUE;
314314
}
315315
case IDC_STATIC_URL_GITHUB_COMMIT:
316316
#if defined(GITHUB_COMMIT_URL)
317-
::ShellExecute(GetHwnd(), nullptr, _T(GITHUB_COMMIT_URL), nullptr, nullptr, SW_SHOWNORMAL);
317+
::ShellExecute(GetHwnd(), nullptr, TEXT(GITHUB_COMMIT_URL), nullptr, nullptr, SW_SHOWNORMAL);
318318
#endif
319319
return TRUE;
320320
case IDC_STATIC_URL_GITHUB_PR:
321321
#if defined(GITHUB_PR_HEAD_URL)
322-
::ShellExecute(GetHwnd(), nullptr, _T(GITHUB_PR_HEAD_URL), nullptr, nullptr, SW_SHOWNORMAL);
322+
::ShellExecute(GetHwnd(), nullptr, TEXT(GITHUB_PR_HEAD_URL), nullptr, nullptr, SW_SHOWNORMAL);
323323
#endif
324324
return TRUE;
325325
}

‎sakura_core/func/CKeyBind.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ WCHAR* CKeyBind::MakeMenuLabel(const WCHAR* sName, const WCHAR* sKey)
399399
}
400400
else {
401401
if( !GetDllShareData().m_Common.m_sMainMenu.m_bMainMenuKeyParentheses
402-
&& (((p = wcschr( sName, sKey[0])) != nullptr) || ((p = wcschr( sName, _totlower(sKey[0]))) != nullptr)) ){
402+
&& (((p = wcschr( sName, sKey[0])) != nullptr) || ((p = wcschr( sName, towlower(sKey[0]))) != nullptr)) ){
403403
// 欧文風、使用している文字をアクセスキーに
404404
wcscpy_s( sLabel, _countof(sLabel), sName );
405405
sLabel[p-sName] = L'&';

‎sakura_core/util/window.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ HFONT UpdateDialogFont( HWND hwnd, BOOL force )
408408
{
409409
HFONT hFontDialog = (HFONT)::SendMessageAny( hwnd, WM_GETFONT, 0, (LPARAM)nullptr );
410410

411-
if( !force && wcsncmp_literal( CSelectLang::getDefaultLangString(), _T("Japanese") ) != 0 ){
411+
if( !force && wcsncmp_literal( CSelectLang::getDefaultLangString(), L"Japanese" ) != 0 ){
412412
return hFontDialog;
413413
}
414414

0 commit comments

Comments
 (0)