From df51f338983ba85feffcbd2209100c6927dda8a5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 16 Jan 2017 18:19:15 +0300
Subject: Utf8DecodeT/Utf8EncodeT macros considered useless and replaced with
 Utf8DecodeW/Utf8EncodeW

---
 src/core/stdauth/src/authdialogs.cpp | 18 +++++++++---------
 src/core/stdfile/src/file.cpp        |  4 ++--
 src/core/stdfile/src/filexferdlg.cpp |  2 +-
 src/core/stdhelp/src/about.cpp       |  2 +-
 src/core/stdssl/src/netlibssl.cpp    |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/core/stdauth/src/authdialogs.cpp b/src/core/stdauth/src/authdialogs.cpp
index 7ddfd7c407..97845bd930 100644
--- a/src/core/stdauth/src/authdialogs.cpp
+++ b/src/core/stdauth/src/authdialogs.cpp
@@ -55,10 +55,10 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 
 			PROTOACCOUNT* acc = Proto_GetAccount(dbei.szModule);
 
-			wchar_t* lastT = dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2u(last);
-			wchar_t* firstT = dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2u(first);
-			wchar_t* nickT = dbei.flags & DBEF_UTF ? Utf8DecodeT(nick) : mir_a2u(nick);
-			wchar_t* emailT = dbei.flags & DBEF_UTF ? Utf8DecodeT(email) : mir_a2u(email);
+			wchar_t* lastT = dbei.flags & DBEF_UTF ? Utf8DecodeW(last) : mir_a2u(last);
+			wchar_t* firstT = dbei.flags & DBEF_UTF ? Utf8DecodeW(first) : mir_a2u(first);
+			wchar_t* nickT = dbei.flags & DBEF_UTF ? Utf8DecodeW(nick) : mir_a2u(nick);
+			wchar_t* emailT = dbei.flags & DBEF_UTF ? Utf8DecodeW(email) : mir_a2u(email);
 
 			wchar_t name[128] = L"";
 			int off = 0;
@@ -179,11 +179,11 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 
 			PROTOACCOUNT *acc = Proto_GetAccount(dbei.szModule);
 
-			ptrW lastT(dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2u(last));
-			ptrW firstT(dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2u(first));
-			ptrW nickT(dbei.flags & DBEF_UTF ? Utf8DecodeT(nick) : mir_a2u(nick));
-			ptrW emailT(dbei.flags & DBEF_UTF ? Utf8DecodeT(email) : mir_a2u(email));
-			ptrW reasonT(dbei.flags & DBEF_UTF ? Utf8DecodeT(reason) : mir_a2u(reason));
+			ptrW lastT(dbei.flags & DBEF_UTF ? Utf8DecodeW(last) : mir_a2u(last));
+			ptrW firstT(dbei.flags & DBEF_UTF ? Utf8DecodeW(first) : mir_a2u(first));
+			ptrW nickT(dbei.flags & DBEF_UTF ? Utf8DecodeW(nick) : mir_a2u(nick));
+			ptrW emailT(dbei.flags & DBEF_UTF ? Utf8DecodeW(email) : mir_a2u(email));
+			ptrW reasonT(dbei.flags & DBEF_UTF ? Utf8DecodeW(reason) : mir_a2u(reason));
 
 			wchar_t name[128] = L"";
 			int off = 0;
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index d07d8b3ee8..7bb233df4f 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -373,9 +373,9 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)
 	if (bUnicode) {
 		pszFiles = (char**)alloca(pre->fileCount * sizeof(char*));
 		for (int i = 0; i < pre->fileCount; i++)
-			pszFiles[i] = Utf8EncodeT(pre->files.w[i]);
+			pszFiles[i] = Utf8EncodeW(pre->files.w[i]);
 		
-		szDescr = Utf8EncodeT(pre->descr.w);
+		szDescr = Utf8EncodeW(pre->descr.w);
 	}
 	else {
 		pszFiles = pre->files.a;
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index bf8088ab0c..9427d258b2 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -80,7 +80,7 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei)
 	dbei.eventType = EVENTTYPE_FILE;
 	dbei.flags = DBEF_SENT;
 	dbei.timestamp = time(NULL);
-	char *szFileNames = Utf8EncodeT(dat->szFilenames), *szMsg = Utf8EncodeT(dat->szMsg);
+	char *szFileNames = Utf8EncodeW(dat->szFilenames), *szMsg = Utf8EncodeW(dat->szMsg);
 	dbei.flags |= DBEF_UTF;
 
 	dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);
diff --git a/src/core/stdhelp/src/about.cpp b/src/core/stdhelp/src/about.cpp
index 75a859b520..83adcdd3c4 100644
--- a/src/core/stdhelp/src/about.cpp
+++ b/src/core/stdhelp/src/about.cpp
@@ -67,7 +67,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 
 				wchar_t *ptszMsg;
 				if (ResSize >=3 && pszMsgt[0] == '\xef' && pszMsgt[1] == '\xbb' && pszMsgt[2] == '\xbf')
-					ptszMsg = Utf8DecodeT(pszMsgt + 3);
+					ptszMsg = Utf8DecodeW(pszMsgt + 3);
 				else
 					ptszMsg = mir_a2u_cp(pszMsgt, 1252);
 
diff --git a/src/core/stdssl/src/netlibssl.cpp b/src/core/stdssl/src/netlibssl.cpp
index ac76c28064..f06947bb8d 100644
--- a/src/core/stdssl/src/netlibssl.cpp
+++ b/src/core/stdssl/src/netlibssl.cpp
@@ -82,7 +82,7 @@ static void ReportSslError(SECURITY_STATUS scRet, int line, bool = false)
 	wchar_t szMsgBuf2[512];
 	mir_snwprintf(szMsgBuf2, L"SSL connection failure (%x %u): %s", scRet, line, szMsgBuf);
 
-	char* szMsg = Utf8EncodeT(szMsgBuf2);
+	char* szMsg = Utf8EncodeW(szMsgBuf2);
 	Netlib_Logf(NULL, szMsg);
 	mir_free(szMsg);
 
-- 
cgit v1.2.3