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/Toaster/src/main.cpp | 4 ++-- plugins/Toaster/src/options.cpp | 2 +- plugins/Toaster/src/utils.cpp | 2 +- plugins/Toaster/src/utils.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Toaster/src') diff --git a/plugins/Toaster/src/main.cpp b/plugins/Toaster/src/main.cpp index 03c0dc287c..3aa449ad98 100644 --- a/plugins/Toaster/src/main.cpp +++ b/plugins/Toaster/src/main.cpp @@ -73,11 +73,11 @@ int OnPreShutdown(WPARAM, LPARAM) NULL, FO_DELETE, wszTempDir, - _T(""), + L"", FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION, false, 0, - _T("") + L"" }; SHFileOperation(&file_op); diff --git a/plugins/Toaster/src/options.cpp b/plugins/Toaster/src/options.cpp index a62c758200..d023d19d67 100644 --- a/plugins/Toaster/src/options.cpp +++ b/plugins/Toaster/src/options.cpp @@ -46,7 +46,7 @@ void COptions::Enabled_OnChange(CCtrlCheck* chk) int OnOptionsInitialized(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.ptszTitle = _T("Popups"); //_T(MODULE); + odp.ptszTitle = L"Popups"; //_T(MODULE); odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.position = -790000000; odp.ptszTab = _T(MODULE); diff --git a/plugins/Toaster/src/utils.cpp b/plugins/Toaster/src/utils.cpp index 86062d2f4a..a46ea09cb4 100644 --- a/plugins/Toaster/src/utils.cpp +++ b/plugins/Toaster/src/utils.cpp @@ -7,7 +7,7 @@ using namespace Microsoft::WRL; wchar_t* GetShortcutPath() { wchar_t path[MAX_PATH]; - GetEnvironmentVariable(_T("APPDATA"), path, MAX_PATH); + GetEnvironmentVariable(L"APPDATA", path, MAX_PATH); wcscat_s(path, _T(SHORTCUT_PATH)); return mir_wstrdup(path); } diff --git a/plugins/Toaster/src/utils.h b/plugins/Toaster/src/utils.h index 858d04f1be..85547164ab 100644 --- a/plugins/Toaster/src/utils.h +++ b/plugins/Toaster/src/utils.h @@ -11,7 +11,7 @@ class ToasterImage ptrT tszId; public: - __inline explicit ToasterImage(HICON hIcon) : _hBitmap(NULL), tszId(CMString(FORMAT, _T("%p"), hIcon).Detach()) + __inline explicit ToasterImage(HICON hIcon) : _hBitmap(NULL), tszId(CMString(FORMAT, L"%p", hIcon).Detach()) { ICONINFO icon = { 0 }; if (GetIconInfo(hIcon, &icon)) @@ -21,7 +21,7 @@ public: } } - __inline explicit ToasterImage(HBITMAP bmp) : _hBitmap(bmp), tszId(CMString(FORMAT, _T("%p"), bmp).Detach()) + __inline explicit ToasterImage(HBITMAP bmp) : _hBitmap(bmp), tszId(CMString(FORMAT, L"%p", bmp).Detach()) { } -- cgit v1.2.3