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/ChangeKeyboardLayout/src/hook_events.cpp | 2 +- plugins/ChangeKeyboardLayout/src/main.cpp | 4 ++-- plugins/ChangeKeyboardLayout/src/options.cpp | 2 +- plugins/ChangeKeyboardLayout/src/text_operations.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/ChangeKeyboardLayout/src') diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 29ce01d5f1..35584b5d04 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -95,7 +95,7 @@ int OnIconsChanged(WPARAM, LPARAM) int ModulesLoaded(WPARAM, LPARAM) { - LPCTSTR ptszEmptySting = _T(""); + LPCTSTR ptszEmptySting = L""; // Заполняем конфигурационные строки из базы. Если их там нет - генерируем. for (int i = 0; i < bLayNum; i++) { diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp index d97174c591..7aeb901eeb 100644 --- a/plugins/ChangeKeyboardLayout/src/main.cpp +++ b/plugins/ChangeKeyboardLayout/src/main.cpp @@ -25,10 +25,10 @@ PLUGININFOEX pluginInfoEx = { {0xc5ef53a8, 0x80d4, 0x4ce9, {0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56}} }; -LPCTSTR ptszKeybEng = _T("`1234567890- = \\qwertyuiop[]asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+|QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?"); +LPCTSTR ptszKeybEng = L"`1234567890- = \\qwertyuiop[]asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+|QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?"; HKL hklEng = (HKL)0x04090409; -LPCTSTR ptszSeparators = _T(" \t\n\r"); +LPCTSTR ptszSeparators = L" \t\n\r"; HANDLE hOptionsInitialize; diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp index a7dc262382..b6f9310819 100644 --- a/plugins/ChangeKeyboardLayout/src/options.cpp +++ b/plugins/ChangeKeyboardLayout/src/options.cpp @@ -355,7 +355,7 @@ INT_PTR CALLBACK DlgPopupsProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, POPUPDATAT_V2 pdtData = { 0 }; pdtData.cbSize = sizeof(pdtData); _tcsncpy(pdtData.lptzContactName, TranslateT(ModuleName), MAX_CONTACTNAME); - _tcsncpy(pdtData.lptzText, _T("Ghbdtn? rfr ltkf&"), MAX_SECONDLINE); + _tcsncpy(pdtData.lptzText, L"Ghbdtn? rfr ltkf&", MAX_SECONDLINE); switch(poOptionsTemp.bColourType) { case PPC_POPUP: diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp index 85295e4ad7..d66dd38e70 100644 --- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp +++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp @@ -260,7 +260,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) i = GetClassName(hTextWnd, ptszTemp, 255); ptszTemp[i] = 0; - if (_tcsstr(CharUpper(ptszTemp), _T("RICHEDIT")) != NULL) { + if (_tcsstr(CharUpper(ptszTemp), L"RICHEDIT") != NULL) { WindowType = WTYPE_RichEdit; SendMessage(hTextWnd, EM_EXGETSEL, 0, (LPARAM)&crSelection); } @@ -417,10 +417,10 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) for (i = 0; i < bLayNum; i++) if (hklLayouts[i] != hklCurLay) { if (mir_tstrlen(ptszMBox) != 0) - mir_tstrcat(ptszMBox, _T("\n\n")); + mir_tstrcat(ptszMBox, L"\n\n"); ptrT ptszTemp(GetShortNameOfLayout(hklLayouts[i])); mir_tstrcat(ptszMBox, ptszTemp); - mir_tstrcat(ptszMBox, _T(":\n")); + mir_tstrcat(ptszMBox, L":\n"); ptrT ptszOutText(ChangeTextLayout(ptszInText, hklCurLay, hklLayouts[i], FALSE)); mir_tstrcat(ptszMBox, ptszOutText); } -- cgit v1.2.3