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/SimpleAR/src/Main.cpp    | 18 +++++++++---------
 plugins/SimpleAR/src/Options.cpp | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'plugins/SimpleAR/src')

diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp
index a9b9200fd3..04583e3961 100644
--- a/plugins/SimpleAR/src/Main.cpp
+++ b/plugins/SimpleAR/src/Main.cpp
@@ -97,10 +97,10 @@ INT CheckDefaults(WPARAM, LPARAM)
 {
 	interval = db_get_w(NULL, protocolname, KEY_REPEATINTERVAL, 300);
 
-	wchar_t *ptszVal = db_get_tsa(NULL, protocolname, KEY_HEADING);
+	wchar_t *ptszVal = db_get_wsa(NULL, protocolname, KEY_HEADING);
 	if (ptszVal == 0)
 		// Heading not set
-		db_set_ts(NULL, protocolname, KEY_HEADING, TranslateT("Dear %user%, the owner left the following message:"));
+		db_set_ws(NULL, protocolname, KEY_HEADING, TranslateT("Dear %user%, the owner left the following message:"));
 	else
 		mir_free(ptszVal);
 
@@ -110,7 +110,7 @@ INT CheckDefaults(WPARAM, LPARAM)
 		else {
 			char szStatus[6] = { 0 };
 			mir_snprintf(szStatus, "%d", c);
-			ptszVal = db_get_tsa(NULL, protocolname, szStatus);
+			ptszVal = db_get_wsa(NULL, protocolname, szStatus);
 			if (ptszVal == 0) {
 				wchar_t *ptszDefault;
 				if (c < ID_STATUS_FREECHAT)
@@ -121,7 +121,7 @@ INT CheckDefaults(WPARAM, LPARAM)
 				else
 					ptszDefault = 0;
 				if (ptszDefault)
-					db_set_ts(NULL, protocolname, szStatus, TranslateTS(ptszDefault));
+					db_set_ws(NULL, protocolname, szStatus, TranslateW(ptszDefault));
 			}
 			else
 				mir_free(ptszVal);
@@ -164,7 +164,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
 		if (!dbei.cbBlob)	/// invalid size
 			return FALSE;
 
-		wchar_t *ptszVal = db_get_tsa(hContact, "Protocol", "p");
+		wchar_t *ptszVal = db_get_wsa(hContact, "Protocol", "p");
 		if (ptszVal == NULL) // Contact with no protocol ?!!
 			return FALSE;
 		mir_free(ptszVal);
@@ -185,12 +185,12 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
 
 				char szStatus[6] = { 0 };
 				mir_snprintf(szStatus, "%d", status);
-				ptszVal = db_get_tsa(NULL, protocolname, szStatus);
+				ptszVal = db_get_wsa(NULL, protocolname, szStatus);
 				if (ptszVal) {
 					if (*ptszVal) {
-						CMString ptszTemp;
+						CMStringW ptszTemp;
 
-						wchar_t *ptszNick = db_get_tsa(hContact, pszProto, "Nick");
+						wchar_t *ptszNick = db_get_wsa(hContact, pszProto, "Nick");
 						if (ptszNick == 0) {
 							mir_free(ptszVal);
 							return FALSE;
@@ -198,7 +198,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
 
 						msgLen += mir_wstrlen(ptszVal);
 
-						wchar_t *ptszHead = db_get_tsa(NULL, protocolname, KEY_HEADING);
+						wchar_t *ptszHead = db_get_wsa(NULL, protocolname, KEY_HEADING);
 						if (ptszHead != NULL) {
 							ptszTemp = ptszHead;
 							ptszTemp.Replace(L"%user%", ptszNick);
diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp
index 59dbbe5ad6..f603dcdebe 100644
--- a/plugins/SimpleAR/src/Options.cpp
+++ b/plugins/SimpleAR/src/Options.cpp
@@ -15,7 +15,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			SetDlgItemInt(hwndDlg, IDC_INTERVAL, db_get_w(NULL, protocolname, KEY_REPEATINTERVAL, 300) / 60, FALSE);
 
 			DBVARIANT dbv;
-			if (!db_get_ts(NULL, protocolname, KEY_HEADING, &dbv)) {
+			if (!db_get_ws(NULL, protocolname, KEY_HEADING, &dbv)) {
 				SetDlgItemText(hwndDlg, IDC_HEADING, dbv.ptszVal);
 				db_free(&dbv);
 			}
@@ -28,7 +28,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				else {
 					SendDlgItemMessage(hwndDlg, IDC_STATUSMODE, CB_ADDSTRING, 0, (LPARAM)pszStatus);
 
-					if (!db_get_ts(NULL, protocolname, tszStatus, &dbv)) {
+					if (!db_get_ws(NULL, protocolname, tszStatus, &dbv)) {
 						if (c < ID_STATUS_FREECHAT)
 							ptszMessage[c - ID_STATUS_ONLINE - 1] = wcsdup(dbv.ptszVal);
 						else if (c > ID_STATUS_INVISIBLE)
@@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
 			break;
 		case IDC_DEFAULT:
-			SetDlgItemText(hwndDlg, IDC_MESSAGE, TranslateTS(ptszDefaultMsg[lastIndex]));
+			SetDlgItemText(hwndDlg, IDC_MESSAGE, TranslateW(ptszDefaultMsg[lastIndex]));
 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
 			break;
 		case IDC_INTERVAL:
@@ -88,7 +88,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				Menu_ModifyItem(hEnableMenu, LPGENW("Enable Auto&reply"), iconList[1].hIcolib);
 
 			GetDlgItemText(hwndDlg, IDC_HEADING, ptszText, _countof(ptszText));
-			db_set_ts(NULL, protocolname, KEY_HEADING, ptszText);
+			db_set_ws(NULL, protocolname, KEY_HEADING, ptszText);
 
 			INT size = GetDlgItemInt(hwndDlg, IDC_INTERVAL, &translated, FALSE);
 			if (translated)
@@ -106,9 +106,9 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 					mir_snprintf(szStatus, "%d", c);
 
 					if (c<ID_STATUS_FREECHAT && ptszMessage[c - ID_STATUS_ONLINE - 1])
-						db_set_ts(NULL, protocolname, szStatus, ptszMessage[c - ID_STATUS_ONLINE - 1]);
+						db_set_ws(NULL, protocolname, szStatus, ptszMessage[c - ID_STATUS_ONLINE - 1]);
 					else if (c>ID_STATUS_INVISIBLE && ptszMessage[c - ID_STATUS_ONLINE - 3])
-						db_set_ts(NULL, protocolname, szStatus, ptszMessage[c - ID_STATUS_ONLINE - 3]);
+						db_set_ws(NULL, protocolname, szStatus, ptszMessage[c - ID_STATUS_ONLINE - 3]);
 					else
 						db_unset(NULL, protocolname, szStatus);
 				}
-- 
cgit v1.2.3