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/Scriver/src/chat/options.cpp | 10 +++++-----
 plugins/Scriver/src/chat/tools.cpp   |  2 +-
 plugins/Scriver/src/chat/window.cpp  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/Scriver/src/chat')

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 985077fde9..4063da39ae 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -113,7 +113,7 @@ static HTREEITEM InsertBranch(HWND hwndTree, wchar_t* pszDescr, BOOL bExpanded)
 	tvis.hParent = NULL;
 	tvis.hInsertAfter = TVI_LAST;
 	tvis.item.mask = TVIF_TEXT | TVIF_STATE;
-	tvis.item.pszText = TranslateTS(pszDescr);
+	tvis.item.pszText = TranslateW(pszDescr);
 	tvis.item.stateMask = bExpanded ? TVIS_STATEIMAGEMASK | TVIS_EXPANDED : TVIS_STATEIMAGEMASK;
 	tvis.item.state = bExpanded ? INDEXTOSTATEIMAGEMASK(1) | TVIS_EXPANDED : INDEXTOSTATEIMAGEMASK(1);
 	return TreeView_InsertItem(hwndTree, &tvis);
@@ -128,7 +128,7 @@ static void FillBranch(HWND hwndTree, HTREEITEM hParent, struct branch_t *branch
 	tvis.hInsertAfter = TVI_LAST;
 	tvis.item.mask = TVIF_TEXT | TVIF_STATE;
 	for (int i = 0; i < nValues; i++) {
-		tvis.item.pszText = TranslateTS(branch[i].szDescr);
+		tvis.item.pszText = TranslateW(branch[i].szDescr);
 		tvis.item.stateMask = TVIS_STATEIMAGEMASK;
 		if (branch[i].iMode)
 			iState = ((db_get_dw(NULL, CHAT_MODULE, branch[i].szDBName, defaultval)&branch[i].iMode)&branch[i].iMode) != 0 ? 2 : 1;
@@ -225,7 +225,7 @@ static INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM p
 static void InitSetting(wchar_t **ppPointer, char *pszSetting, wchar_t *pszDefault)
 {
 	DBVARIANT dbv;
-	if ( !db_get_ts(NULL, CHAT_MODULE, pszSetting, &dbv )) {
+	if ( !db_get_ws(NULL, CHAT_MODULE, pszSetting, &dbv )) {
 		replaceStrW(*ppPointer, dbv.ptszVal);
 		db_free(&dbv);
 	}
@@ -529,7 +529,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 						*p2 = ' ';
 						p2 = wcschr(ptszText, (wchar_t)',');
 					}
-					db_set_ts(NULL, CHAT_MODULE, "HighlightWords", ptszText);
+					db_set_ws(NULL, CHAT_MODULE, "HighlightWords", ptszText);
 					mir_free(ptszText);
 				}
 			}
@@ -539,7 +539,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 			if (iLen > 0) {
 				wchar_t *pszText1 = (wchar_t*)malloc(iLen*sizeof(wchar_t)+2);
 				GetDlgItemText(hwndDlg, IDC_CHAT_LOGDIRECTORY, pszText1, iLen + 1);
-				db_set_ts(NULL, CHAT_MODULE, "LogDirectory", pszText1);
+				db_set_ws(NULL, CHAT_MODULE, "LogDirectory", pszText1);
 				free(pszText1);
 			}
 			else {
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index 3b9c78291c..7b002430ff 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -79,7 +79,7 @@ UINT CreateGCMenu(HWND hwnd, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *s
 		AppendMenu(*hMenu, MF_SEPARATOR, 0, 0);
 
 	for (int i = 0; i < gcmi.nItems; i++) {
-		wchar_t *ptszText = TranslateTS(gcmi.Item[i].pszDesc);
+		wchar_t *ptszText = TranslateW(gcmi.Item[i].pszDesc);
 		DWORD dwState = gcmi.Item[i].bDisabled ? MF_GRAYED : 0;
 
 		if (gcmi.Item[i].uType == MENU_NEWPOPUP) {
diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 0be7880de0..565a5f8111 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1706,7 +1706,7 @@ LABEL_SHOWWINDOW:
 				// takes pszRtf to a queue, no leak here
 				si->cmdList = tcmdlist_append(si->cmdList, pszRtf, 20, FALSE);
 
-				CMString ptszText(ptrW(mir_utf8decodeW(pszRtf)));
+				CMStringW ptszText(ptrW(mir_utf8decodeW(pszRtf)));
 				pci->DoRtfToTags(ptszText, mi->nColorCount, mi->crColors);
 				ptszText.Trim();
 				ptszText.Replace(L"%", L"%%");
@@ -1907,7 +1907,7 @@ LABEL_SHOWWINDOW:
 			mii.wID = i + 1;
 			mii.dwItemData = (ULONG_PTR)g_dat.hChatButtonIconList;
 			mii.hbmpItem = HBMMENU_CALLBACK;
-			mii.dwTypeData = TranslateTS((toolbarButtons[i].name));
+			mii.dwTypeData = TranslateW((toolbarButtons[i].name));
 			InsertMenuItem(hToolbarMenu, i, TRUE, &mii);
 		}
 
-- 
cgit v1.2.3