From d7e53c4d5a748d5ef8c934e90dc59ff23c667420 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 26 Dec 2021 15:13:30 +0300
Subject: WCHAR -> wchar_t

---
 plugins/ClientChangeNotify/src/CString.cpp |  2 +-
 plugins/ClientChangeNotify/src/CString.h   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/ClientChangeNotify')

diff --git a/plugins/ClientChangeNotify/src/CString.cpp b/plugins/ClientChangeNotify/src/CString.cpp
index ece8b81645..911bda8621 100644
--- a/plugins/ClientChangeNotify/src/CString.cpp
+++ b/plugins/ClientChangeNotify/src/CString.cpp
@@ -255,7 +255,7 @@ TString<T>& TString<T>::operator=(const T *pStr)
 
 template class TString<wchar_t>;
 template class TString<char>;
-template class TString<WCHAR>;
+template class TString<wchar_t>;
 
 CString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue)
 {
diff --git a/plugins/ClientChangeNotify/src/CString.h b/plugins/ClientChangeNotify/src/CString.h
index cf18c6f881..f405457998 100644
--- a/plugins/ClientChangeNotify/src/CString.h
+++ b/plugins/ClientChangeNotify/src/CString.h
@@ -100,17 +100,17 @@ private:
 
 typedef TString<wchar_t> TCString;
 typedef TString<char> CString;
-typedef TString<WCHAR> WCString;
+typedef TString<wchar_t> WCString;
 
 #ifdef CHARARRAY_CONVERT
 
 __inline CHARARRAY WCHAR2ANSI_ARRAY(CHARARRAY &c)
 {
 	CHARARRAY Result;
-	int Len = WideCharToMultiByte(CP_ACP, 0, (WCHAR*)c.GetData(), c.GetSize() / sizeof(WCHAR), NULL, 0, NULL, NULL);
+	int Len = WideCharToMultiByte(CP_ACP, 0, (wchar_t*)c.GetData(), c.GetSize() / sizeof(wchar_t), NULL, 0, NULL, NULL);
 	if (Len) {
 		Result.SetAtGrow(Len - 1);
-		if (!WideCharToMultiByte(CP_ACP, 0, (WCHAR*)c.GetData(), c.GetSize() / sizeof(WCHAR), Result.GetData(), Len, NULL, NULL)) {
+		if (!WideCharToMultiByte(CP_ACP, 0, (wchar_t*)c.GetData(), c.GetSize() / sizeof(wchar_t), Result.GetData(), Len, NULL, NULL)) {
 			Result.RemoveAll();
 		}
 		if (Result.GetSize()) {
@@ -125,8 +125,8 @@ __inline CHARARRAY ANSI2WCHAR_ARRAY(CHARARRAY &c)
 	CHARARRAY Result;
 	int Len = MultiByteToWideChar(CP_ACP, 0, c.GetData(), c.GetSize(), NULL, 0);
 	if (Len) {
-		Result.SetAtGrow(Len * sizeof(WCHAR) - 1);
-		if (!MultiByteToWideChar(CP_ACP, 0, c.GetData(), c.GetSize(), (WCHAR*)Result.GetData(), Len)) {
+		Result.SetAtGrow(Len * sizeof(wchar_t) - 1);
+		if (!MultiByteToWideChar(CP_ACP, 0, c.GetData(), c.GetSize(), (wchar_t*)Result.GetData(), Len)) {
 			Result.RemoveAll();
 		}
 		if (Result.GetSize()) {
-- 
cgit v1.2.3