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/Msg_Export/src/FileViewer.cpp |  2 +-
 plugins/Msg_Export/src/options.cpp    |  4 ++--
 plugins/Msg_Export/src/utils.cpp      | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/Msg_Export')

diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index f8b48d7ece..a158317a01 100755
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
@@ -1053,7 +1053,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam,
 				db_set_dw(NULL, MODULE, szFileViewDB "TEffects", dwEffects);
 				db_set_dw(NULL, MODULE, szFileViewDB "THeight", cf.iPointSize * 2);
 				db_set_dw(NULL, MODULE, szFileViewDB "TColor", cf.rgbColors);
-				db_set_ts(NULL, MODULE, szFileViewDB "TFace", lf.lfFaceName);
+				db_set_ws(NULL, MODULE, szFileViewDB "TFace", lf.lfFaceName);
 				SetRichEditFont(hRichEdit, bUseSyntaxHL);
 			}
 			return TRUE;
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 0b3faed0f8..b09b5dae4d 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -366,7 +366,7 @@ BOOL bApplyChanges(HWND hwndDlg)
 		if (ListView_GetItem(hMapUser, &sItem)) {
 			MCONTACT hUser = (MCONTACT)sItem.lParam;
 			if (mir_wstrlen(szTemp) > 0)
-				db_set_ts(hUser, MODULE, "FileName", szTemp);
+				db_set_ws(hUser, MODULE, "FileName", szTemp);
 			else
 				db_unset(hUser, MODULE, "FileName");
 
@@ -1226,7 +1226,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/)
 	odp.position = 100000000;
 	odp.hInstance = hInstance;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT);
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 	odp.pwszTitle = LPGENW("Message export");
 	odp.pwszGroup = LPGENW("History");
 	odp.pwszTab = LPGENW("General");
diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 686b006ffb..74bc251e71 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -465,12 +465,12 @@ bool bReadMirandaDirAndPath()
 {
 	wchar_t szDBPath[MAX_PATH], tmp[MAX_PATH];
 	mir_wstrcpy(szDBPath, pszDbPathError);
-	PathToAbsoluteT(L"miranda32.exe", tmp);
+	PathToAbsoluteW(L"miranda32.exe", tmp);
 	sMirandaPath = tmp;
 	sMirandaPath.erase(sMirandaPath.find_last_of(L"\\"));
-	CallService(MS_DB_GETPROFILEPATHT, (WPARAM)MAX_PATH - 1, (LPARAM)szDBPath);
+	CallService(MS_DB_GETPROFILEPATHW, (WPARAM)MAX_PATH - 1, (LPARAM)szDBPath);
 	sDBPath = szDBPath;
-	CallService(MS_DB_GETPROFILENAMET, (WPARAM)MAX_PATH - 1, (LPARAM)szDBPath);
+	CallService(MS_DB_GETPROFILENAMEW, (WPARAM)MAX_PATH - 1, (LPARAM)szDBPath);
 	sDBPath.append(L"\\").append(szDBPath);
 	sDBPath.erase(sDBPath.size() - 4);
 	return true;
@@ -596,7 +596,7 @@ tstring GetFilePathFromUser(MCONTACT hContact)
 		}
 
 		// Store the Filename used so that we can check if it changes.
-		db_set_ts(hContact, MODULE, "PrevFileName", sNoDBPath.c_str());
+		db_set_ws(hContact, MODULE, "PrevFileName", sNoDBPath.c_str());
 	}
 
 	return sFilePath;
@@ -812,7 +812,7 @@ void UpdateFileToColWidth()
 
 void DisplayErrorDialog(const wchar_t *pszError, tstring& sFilePath, DBEVENTINFO * dbei)
 {
-	tstring sError = TranslateTS(pszError);
+	tstring sError = TranslateW(pszError);
 	sError += sFilePath;
 	sError += TranslateT("\nError: ");
 	sError += sGetErrorString();
@@ -1013,7 +1013,7 @@ void ExportDBEventInfo(MCONTACT hContact, DBEVENTINFO &dbei)
 		switch (dbei.eventType) {
 		case EVENTTYPE_MESSAGE:
 			{
-				wchar_t *msg = DbGetEventTextT(&dbei, CP_ACP);
+				wchar_t *msg = DbGetEventTextW(&dbei, CP_ACP);
 				if (!bWriteIndentedToFile(hFile, nIndent, msg, bWriteUTF8Format)) {
 					DisplayErrorDialog(LPGENW("Failed to write message to the file :\n"), sFilePath, &dbei);
 				}
@@ -1109,7 +1109,7 @@ void ExportDBEventInfo(MCONTACT hContact, DBEVENTINFO &dbei)
 						for (int i = 0; i < nStringCount && pszCurBlobPos < pszEnd; i++) {
 							if (*pszCurBlobPos) {
 								if (!bWriteNewLine(hFile, nIndent) ||
-									!bWriteTextToFile(hFile, TranslateTS(pszTypes[i]), bWriteUTF8Format) ||
+									!bWriteTextToFile(hFile, TranslateW(pszTypes[i]), bWriteUTF8Format) ||
 									!bWriteIndentedToFile(hFile, nIndent, pszCurBlobPos, bWriteUTF8Format)) {
 									break;
 								}
@@ -1414,11 +1414,11 @@ int nContactDeleted(WPARAM wparam, LPARAM /*lparam*/)
 void SaveSettings()
 {
 	db_set_w(NULL, MODULE, "MaxLineWidth", (WORD)nMaxLineWidth);
-	db_set_ts(NULL, MODULE, "ExportDir", sExportDir.c_str());
-	db_set_ts(NULL, MODULE, "DefaultFile", sDefaultFile.c_str());
-	db_set_ts(NULL, MODULE, "TimeFormat", sTimeFormat.c_str());
+	db_set_ws(NULL, MODULE, "ExportDir", sExportDir.c_str());
+	db_set_ws(NULL, MODULE, "DefaultFile", sDefaultFile.c_str());
+	db_set_ws(NULL, MODULE, "TimeFormat", sTimeFormat.c_str());
 
-	db_set_ts(NULL, MODULE, "FileViewerPrg", sFileViewerPrg.c_str());
+	db_set_ws(NULL, MODULE, "FileViewerPrg", sFileViewerPrg.c_str());
 	db_set_b(NULL, MODULE, "UseInternalViewer", bUseInternalViewer());
 	db_set_b(NULL, MODULE, "ReplaceHistory", bReplaceHistory);
 	db_set_b(NULL, MODULE, "AppendNewLine", bAppendNewLine);
-- 
cgit v1.2.3