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/BossKeyPlus/src/BossKey.cpp | 10 +++++-----
 plugins/BossKeyPlus/src/Options.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/BossKeyPlus')

diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index d1e1fab75e..745cabb98c 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -196,7 +196,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM)
 
 wchar_t* GetDefStatusMsg(unsigned uStatus, const char* szProto)
 {
-	return (wchar_t*)CallService(MS_AWAYMSG_GETSTATUSMSGT, uStatus, (LPARAM)szProto);
+	return (wchar_t*)CallService(MS_AWAYMSG_GETSTATUSMSGW, uStatus, (LPARAM)szProto);
 }
 
 void SetStatus(const char* szProto, unsigned status, wchar_t *tszAwayMsg)
@@ -221,7 +221,7 @@ static int ChangeAllProtoStatuses(unsigned statusMode, wchar_t *msg)
 			if (g_wMask & OPT_SETONLINEBACK){ // need to save old statuses & status messages
 				oldStatus[i] = status;
 				if (ProtoServiceExists(proto[i]->szModuleName, PS_GETMYAWAYMSG))
-					oldStatusMsg[i] = (wchar_t*)CallProtoService(proto[i]->szModuleName, PS_GETMYAWAYMSG, 0, SGMA_TCHAR);
+					oldStatusMsg[i] = (wchar_t*)CallProtoService(proto[i]->szModuleName, PS_GETMYAWAYMSG, 0, SGMA_UNICODE);
 				else
 					oldStatusMsg[i] = GetDefStatusMsg(status, proto[i]->szModuleName);
 			}
@@ -253,7 +253,7 @@ static void CreateTrayIcon(bool create)
 {
 	NOTIFYICONDATA nim;
 	DBVARIANT dbVar;
-	if (!db_get_ts(NULL, MOD_NAME, "ToolTipText", &dbVar)) {
+	if (!db_get_ws(NULL, MOD_NAME, "ToolTipText", &dbVar)) {
 		wcsncpy_s(nim.szTip, dbVar.ptszVal, _TRUNCATE);
 		db_free(&dbVar);
 	}
@@ -319,7 +319,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 			BYTE bReqMode = db_get_b(NULL, MOD_NAME, "stattype", 2);
 			unsigned uMode = (STATUS_ARR_TO_ID[bReqMode]);
 			DBVARIANT dbVar;
-			if (g_wMask & OPT_USEDEFMSG || db_get_ts(NULL, MOD_NAME, "statmsg", &dbVar))
+			if (g_wMask & OPT_USEDEFMSG || db_get_ws(NULL, MOD_NAME, "statmsg", &dbVar))
 			{
 				wchar_t *ptszDefMsg = GetDefStatusMsg(uMode, 0);
 				ChangeAllProtoStatuses(uMode, ptszDefMsg);
@@ -532,7 +532,7 @@ void BossKeyMenuItemInit(void) // Add menu item
 {
 	CMenuItem mi;
 	SET_UID(mi, 0x42428114, 0xfac7, 0x44c2, 0x9a, 0x11, 0x18, 0xbe, 0x81, 0xd4, 0xa9, 0xe3);
-	mi.flags = CMIF_TCHAR;
+	mi.flags = CMIF_UNICODE;
 	mi.position = 2000100000;
 	mi.hIcolibItem = IcoLib_GetIcon("hidemim");
 	mi.name.w = LPGENW("Hide");
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index fab96b3e27..682689a7df 100644
--- a/plugins/BossKeyPlus/src/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
@@ -82,7 +82,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 					wchar_t tszMsg[1025];
 					GetDlgItemText(hwndDlg, IDC_MAINOPT_STATMSG, tszMsg, _countof(tszMsg));
 					if (tszMsg[0] != 0)
-						db_set_ts(NULL, MOD_NAME, "statmsg", tszMsg);
+						db_set_ws(NULL, MOD_NAME, "statmsg", tszMsg);
 					else // delete current setting
 						db_unset(NULL, MOD_NAME, "statmsg");
 				}
@@ -123,7 +123,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 		else {
 			DBVARIANT dbVar;
 			SendDlgItemMessage(hwndDlg, IDC_MAINOPT_STATMSG, EM_LIMITTEXT, 1024, 0);
-			if (!db_get_ts(NULL, MOD_NAME, "statmsg", &dbVar)) {
+			if (!db_get_ws(NULL, MOD_NAME, "statmsg", &dbVar)) {
 				SetDlgItemText(hwndDlg, IDC_MAINOPT_STATMSG, dbVar.ptszVal);
 				db_free(&dbVar);
 			}
@@ -326,7 +326,7 @@ int OptsDlgInit(WPARAM wParam, LPARAM)
 	optDi.pwszTitle = LPGENW("BossKey");
 	optDi.pwszGroup = LPGENW("Events");
 	optDi.pwszTab = LPGENW("Main");
-	optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+	optDi.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 	Options_AddPage(wParam, &optDi);
 
 	optDi.pfnDlgProc = AdvOptDlg;
-- 
cgit v1.2.3