From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Jul 2016 12:36:34 +0000
Subject: no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TranslitSwitcher/src/Layoutproc.cpp       |  4 ++--
 plugins/TranslitSwitcher/src/TranslitSwitcher.cpp | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/TranslitSwitcher')

diff --git a/plugins/TranslitSwitcher/src/Layoutproc.cpp b/plugins/TranslitSwitcher/src/Layoutproc.cpp
index 0f75d9f64b..043ccf20b4 100644
--- a/plugins/TranslitSwitcher/src/Layoutproc.cpp
+++ b/plugins/TranslitSwitcher/src/Layoutproc.cpp
@@ -705,7 +705,7 @@ int OnButtonPressed(WPARAM, LPARAM lParam)
 		}
 	}
 
-	ptrW tszSymbol(db_get_tsa(NULL, "TranslitSwitcher", "ResendSymbol"));
+	ptrW tszSymbol(db_get_wsa(NULL, "TranslitSwitcher", "ResendSymbol"));
 	if (!tszSymbol && sel) {
 		SetWindowText(hEdit, sel);
 		SendMessage(hEdit, EM_SETSEL, 0, (LPARAM)slen);
@@ -717,7 +717,7 @@ int OnButtonPressed(WPARAM, LPARAM lParam)
 		SendMessage(cbcd->hwndFrom, WM_COMMAND, IDOK, 0);
 	}
 	else if (sel) {
-		CMString tszFinal(FORMAT, L"%s %s", tszSymbol, sel);
+		CMStringW tszFinal(FORMAT, L"%s %s", tszSymbol, sel);
 		SetWindowText(hEdit, tszFinal.GetString());
 		SendMessage(hEdit, EM_SETSEL, 0, tszFinal.GetLength());
 		SendMessage(cbcd->hwndFrom, WM_COMMAND, IDOK, 0);
diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
index 046d982675..196ea89d6a 100644
--- a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
+++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
@@ -154,42 +154,42 @@ extern "C" __declspec(dllexport) int Load(void)
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
 
 	HOTKEYDESC hkd = { sizeof(hkd) };
-	hkd.dwFlags = HKD_TCHAR;
+	hkd.dwFlags = HKD_UNICODE;
 	hkd.pszName = "TranslitSwitcher/ConvertAllOrSelected";
-	hkd.ptszDescription = LPGENW("Convert All / Selected");
-	hkd.ptszSection = L"TranslitSwitcher";
+	hkd.pwszDescription = LPGENW("Convert All / Selected");
+	hkd.pwszSection = L"TranslitSwitcher";
 	hkd.pszService = MS_TS_SWITCHLAYOUT;
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL + HKCOMB_A, 'R') | HKF_MIRANDA_LOCAL;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "TranslitSwitcher/ConvertLastOrSelected";
-	hkd.ptszDescription = LPGENW("Convert Last / Selected");
+	hkd.pwszDescription = LPGENW("Convert Last / Selected");
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_ALT + HKCOMB_A, 'R') | HKF_MIRANDA_LOCAL;
 	hkd.lParam = true;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "TranslitSwitcher/TranslitAllOrSelected";
-	hkd.ptszDescription = LPGENW("Translit All / Selected");
+	hkd.pwszDescription = LPGENW("Translit All / Selected");
 	hkd.pszService = MS_TS_TRANSLITLAYOUT;
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL + HKCOMB_A, 'T') | HKF_MIRANDA_LOCAL;
 	hkd.lParam = false;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "TranslitSwitcher/TranslitLastOrSelected";
-	hkd.ptszDescription = LPGENW("Translit Last / Selected");
+	hkd.pwszDescription = LPGENW("Translit Last / Selected");
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_ALT + HKCOMB_A, 'T') | HKF_MIRANDA_LOCAL;
 	hkd.lParam = true;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "TranslitSwitcher/InvertCaseAllOrSelected";
-	hkd.ptszDescription = LPGENW("Invert Case All / Selected");
+	hkd.pwszDescription = LPGENW("Invert Case All / Selected");
 	hkd.pszService = MS_TS_INVERTCASE;
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL + HKCOMB_A, 'Y') | HKF_MIRANDA_LOCAL;
 	hkd.lParam = false;
 	Hotkey_Register(&hkd);
 
 	hkd.pszName = "TranslitSwitcher/InvertCaseLastOrSelected";
-	hkd.ptszDescription = LPGENW("Invert Case Last / Selected");
+	hkd.pwszDescription = LPGENW("Invert Case Last / Selected");
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_ALT + HKCOMB_A, 'Y') | HKF_MIRANDA_LOCAL;
 	hkd.lParam = true;
 	Hotkey_Register(&hkd);
-- 
cgit v1.2.3