From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jul 2016 09:20:25 +0000
Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT
 replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that
 improperly used _t functions; - TCHAR *t removed from MAllStrings; -
 ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SecureIM/src/loadicons.cpp |  8 ++++----
 plugins/SecureIM/src/main.cpp      |  2 +-
 plugins/SecureIM/src/options.cpp   | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/SecureIM')

diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp
index a36986d8d9..ceb5a545cd 100644
--- a/plugins/SecureIM/src/loadicons.cpp
+++ b/plugins/SecureIM/src/loadicons.cpp
@@ -76,8 +76,8 @@ void InitIcons(void)
 	HINSTANCE hNewIconInst = NULL;
 
 	if (g_hFolders) {
-		TCHAR pathname[MAX_PATH];
-		FoldersGetCustomPathExT(g_hFolders, pathname, MAX_PATH, "icons\\");
+		char pathname[MAX_PATH];
+		FoldersGetCustomPath(g_hFolders, pathname, MAX_PATH, "icons\\");
 		if (hNewIconInst == NULL)
 			hNewIconInst = LoadIconsPack(pathname);
 	}
@@ -93,12 +93,12 @@ void InitIcons(void)
 	else
 		g_hIconInst = hNewIconInst;
 
-	TCHAR tszPath[MAX_PATH];
+	char tszPath[MAX_PATH];
 	GetModuleFileName(g_hIconInst, tszPath, _countof(tszPath));
 
 	SKINICONDESC sid = { 0 };
 	sid.section.a = "SecureIM";
-	sid.defaultFile.t = tszPath;
+	sid.defaultFile.a = tszPath;
 
 	for (int i = 0; i < _countof(icons); i++) {
 		sid.section.a = icons[i].section;
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 5a02a2cf66..91443d4d5c 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -43,7 +43,7 @@ static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, LPCSTR szUid, HICON hicon,
 	mi.flags = flags | CMIF_HIDDEN | CMIF_UNICODE;
 	mi.position = pos;
 	mi.hIcolibItem = hicon;
-	mi.name.t = (TCHAR*)name;
+	mi.name.w = (wchar_t*)name;
 	mi.pszService = (char*)service;
 	HGENMENU res = Menu_AddContactMenuItem(&mi);
 	Menu_ConfigureItem(res, MCI_OPT_UID, szUid);
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 6c05088389..0adf09a814 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -1573,7 +1573,7 @@ BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath)
 	char temp[MAX_PATH];
 	mir_snprintf(temp, "%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c", Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0);
 	ofn.lpstrFilter = temp;
-	ofn.lpstrTitle = TranslateT("Open Key File");
+	ofn.lpstrTitle = Translate("Open Key File");
 	if (!GetOpenFileName(&ofn)) return FALSE;
 
 	return TRUE;
@@ -1622,7 +1622,7 @@ LPSTR LoadKeys(LPCSTR file, BOOL priv)
 
 BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 {
-	TCHAR szFile[MAX_PATH] = "rsa_pub.asc";
+	char szFile[MAX_PATH] = "rsa_pub.asc";
 	if (priv)
 		mir_tstrcpy(szFile, "rsa_priv.asc");
 
@@ -1635,11 +1635,11 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 	ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON;
 	ofn.lpstrFile = szFile;
 
-	ofn.lpstrTitle = (priv) ? TranslateT("Save Private Key File") : TranslateT("Save Public Key File");
+	ofn.lpstrTitle = (priv) ? Translate("Save Private Key File") : Translate("Save Public Key File");
 	if (!GetSaveFileName(&ofn))
 		return FALSE;
 
-	FILE *f = _tfopen(szFile, "wb");
+	FILE *f = fopen(szFile, "wb");
 	if (!f)
 		return FALSE;
 	fwrite(key, mir_strlen(key), 1, f);
@@ -1650,7 +1650,7 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 
 BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 {
-	TCHAR szFile[MAX_PATH] = "rsa_pub.asc";
+	char szFile[MAX_PATH] = "rsa_pub.asc";
 	if (priv)
 		mir_tstrcpy(szFile, "rsa_priv.asc");
 
@@ -1663,11 +1663,11 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)
 	char temp[MAX_PATH];
 	mir_snprintf(temp, "%s (*.asc)%c*.asc%c%s (*.*)%c*.*%c%c", Translate("ASC files"), 0, 0, Translate("All files"), 0, 0, 0);
 	ofn.lpstrFilter = temp;
-	ofn.lpstrTitle = (priv) ? TranslateT("Load Private Key File") : TranslateT("Load Public Key File");
+	ofn.lpstrTitle = (priv) ? Translate("Load Private Key File") : Translate("Load Public Key File");
 	if (!GetOpenFileName(&ofn))
 		return FALSE;
 
-	FILE *f = _tfopen(szFile, "rb");
+	FILE *f = fopen(szFile, "rb");
 	if (!f)
 		return FALSE;
 
-- 
cgit v1.2.3