From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ExternalAPI/m_NewAwaySys.h | 2 +- plugins/ExternalAPI/m_folders.h | 30 +++++++++++++++--------------- plugins/ExternalAPI/m_listeningto.h | 2 +- plugins/ExternalAPI/m_userinfoex.h | 2 +- plugins/ExternalAPI/m_variables.h | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'plugins/ExternalAPI') diff --git a/plugins/ExternalAPI/m_NewAwaySys.h b/plugins/ExternalAPI/m_NewAwaySys.h index 1a81ec66ff..6b4e0553c7 100644 --- a/plugins/ExternalAPI/m_NewAwaySys.h +++ b/plugins/ExternalAPI/m_NewAwaySys.h @@ -111,7 +111,7 @@ typedef struct { /* An example: NAS_ISWINFO iswi = {0}; // for C you may use ZeroMemory() instead iswi.cbSize = sizeof(iswi); - iswi.tszMsg = _T("New global status message."); + iswi.tszMsg = L"New global status message."; iswi.Flags = ISWF_TCHAR; CallService(MS_NAS_INVOKESTATUSWINDOW, (WPARAM)&iswi, 0); */ diff --git a/plugins/ExternalAPI/m_folders.h b/plugins/ExternalAPI/m_folders.h index 076247480d..b0db2df31f 100644 --- a/plugins/ExternalAPI/m_folders.h +++ b/plugins/ExternalAPI/m_folders.h @@ -49,21 +49,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIRANDA_USERDATAT MIRANDA_USERDATA #endif -#define FOLDER_AVATARS PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\avatars") -#define FOLDER_VCARDS PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\vcards") -#define FOLDER_LOGS PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\logs") -#define FOLDER_RECEIVED_FILES PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\received files") -#define FOLDER_DOCS MIRANDA_PATHT _T("\\") _T("docs") -#define FOLDER_CONFIG PLUGINS_PATHT _T("\\") _T("config") -#define FOLDER_SCRIPTS MIRANDA_PATHT _T("\\") _T("scripts") -#define FOLDER_UPDATES MIRANDA_PATHT _T("\\") _T("updates") - -#define FOLDER_CUSTOMIZE MIRANDA_PATHT _T("\\") _T("customize") -#define FOLDER_CUSTOMIZE_SOUNDS FOLDER_CUSTOMIZE _T("\\sounds") -#define FOLDER_CUSTOMIZE_ICONS FOLDER_CUSTOMIZE _T("\\icons") -#define FOLDER_CUSTOMIZE_SMILEYS FOLDER_CUSTOMIZE _T("\\smileys") -#define FOLDER_CUSTOMIZE_SKINS FOLDER_CUSTOMIZE _T("\\skins") -#define FOLDER_CUSTOMIZE_THEMES FOLDER_CUSTOMIZE _T("\\themes") +#define FOLDER_AVATARS PROFILE_PATHT L"\\" CURRENT_PROFILET L"\\avatars" +#define FOLDER_VCARDS PROFILE_PATHT L"\\" CURRENT_PROFILET L"\\vcards" +#define FOLDER_LOGS PROFILE_PATHT L"\\" CURRENT_PROFILET L"\\logs" +#define FOLDER_RECEIVED_FILES PROFILE_PATHT L"\\" CURRENT_PROFILET L"\\received files" +#define FOLDER_DOCS MIRANDA_PATHT L"\\" L"docs" +#define FOLDER_CONFIG PLUGINS_PATHT L"\\" L"config" +#define FOLDER_SCRIPTS MIRANDA_PATHT L"\\" L"scripts" +#define FOLDER_UPDATES MIRANDA_PATHT L"\\" L"updates" + +#define FOLDER_CUSTOMIZE MIRANDA_PATHT L"\\" L"customize" +#define FOLDER_CUSTOMIZE_SOUNDS FOLDER_CUSTOMIZE L"\\sounds" +#define FOLDER_CUSTOMIZE_ICONS FOLDER_CUSTOMIZE L"\\icons" +#define FOLDER_CUSTOMIZE_SMILEYS FOLDER_CUSTOMIZE L"\\smileys" +#define FOLDER_CUSTOMIZE_SKINS FOLDER_CUSTOMIZE L"\\skins" +#define FOLDER_CUSTOMIZE_THEMES FOLDER_CUSTOMIZE L"\\themes" #define TO_WIDE(x) L ## x diff --git a/plugins/ExternalAPI/m_listeningto.h b/plugins/ExternalAPI/m_listeningto.h index cc0b2990d2..841d73cd36 100644 --- a/plugins/ExternalAPI/m_listeningto.h +++ b/plugins/ExternalAPI/m_listeningto.h @@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. // To be used by other plugins to send listening info to miranda -#define MIRANDA_WINDOWCLASS _T("Miranda.ListeningTo") +#define MIRANDA_WINDOWCLASS L"Miranda.ListeningTo" #define MIRANDA_DW_PROTECTION 0x8754 #define LISTENINGTO_ANSI 1 diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h index 2957c62a6f..f208b1fe22 100644 --- a/plugins/ExternalAPI/m_userinfoex.h +++ b/plugins/ExternalAPI/m_userinfoex.h @@ -275,7 +275,7 @@ lParam = not used /* UserInfo/MsgBox v0.1.0.4+ Slightly modified version of MButtonClass, to draw both text and icon in a button control */ -#define UINFOBUTTONCLASS _T("UInfoButtonClass") +#define UINFOBUTTONCLASS L"UInfoButtonClass" /************************************************************* * contact info module diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h index c638329261..d80bb06e9b 100644 --- a/plugins/ExternalAPI/m_variables.h +++ b/plugins/ExternalAPI/m_variables.h @@ -517,14 +517,14 @@ __inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) { hIcon = (HICON)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPICON); GetClassName(GetDlgItem(hwndDlg, uIDButton), tszClass, _countof(tszClass)); - if (!mir_tstrcmp(tszClass, _T("Button"))) { + if (!mir_tstrcmp(tszClass, L"Button")) { if (hIcon != NULL) { SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)|BS_ICON); SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); } else { SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)&~BS_ICON); - SetDlgItemText(hwndDlg, uIDButton, _T("V")); + SetDlgItemText(hwndDlg, uIDButton, L"V"); } } else if (!mir_tstrcmp(tszClass, MIRANDABUTTONCLASS)) { @@ -541,7 +541,7 @@ __inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) { SendMessage(GetDlgItem(hwndDlg, uIDButton), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0); SendDlgItemMessage(hwndDlg, uIDButton, BUTTONSETASFLATBTN, 0, 0); } - else SetDlgItemText(hwndDlg, uIDButton, _T("V")); + else SetDlgItemText(hwndDlg, uIDButton, L"V"); } else res = -1; -- cgit v1.2.3