From bc0b6bfb2734ce8355ddfb9b20461321c08a0b0c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 17 Mar 2017 13:39:30 +0300
Subject: forgotten TCHAR removed

---
 src/core/stdauth/src/auth.cpp             |  4 ++--
 src/core/stdfile/src/file.cpp             |  4 ++--
 src/core/stdmsg/src/msgs.cpp              | 12 ++++++------
 src/core/stduseronline/src/useronline.cpp |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdauth/src/auth.cpp b/src/core/stdauth/src/auth.cpp
index 44ad9644bb..5b9b433f02 100644
--- a/src/core/stdauth/src/auth.cpp
+++ b/src/core/stdauth/src/auth.cpp
@@ -60,8 +60,8 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 
 	CLISTEVENT cli = {};
 	cli.hContact = hContact;
-	cli.ptszTooltip = szTooltip;
-	cli.flags = CLEF_TCHAR;
+	cli.szTooltip.w = szTooltip;
+	cli.flags = CLEF_UNICODE;
 	cli.lParam = lParam;
 	cli.hDbEvent = hDbEvent;
 
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index aa311ec063..365d9aba06 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -109,9 +109,9 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 
 		wchar_t szTooltip[256];
 		mir_snwprintf(szTooltip, TranslateT("File from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
-		cle.ptszTooltip = szTooltip;
+		cle.szTooltip.w = szTooltip;
 
-		cle.flags |= CLEF_TCHAR;
+		cle.flags |= CLEF_UNICODE;
 		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE);
 		cle.pszService = "SRFile/RecvFile";
 		pcli->pfnAddEvent(&cle);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 595a886a20..4e46cc2188 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -93,10 +93,10 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	CLISTEVENT cle = {};
 	cle.hContact = hContact;
 	cle.hDbEvent = lParam;
-	cle.flags = CLEF_TCHAR;
+	cle.flags = CLEF_UNICODE;
 	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
 	cle.pszService = "SRMsg/ReadMessage";
-	cle.ptszTooltip = toolTip;
+	cle.szTooltip.w = toolTip;
 	pcli->pfnAddEvent(&cle);
 	return 0;
 }
@@ -171,10 +171,10 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
 			cle.hDbEvent = 1;
-			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
+			cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;
 			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING);
 			cle.pszService = "SRMsg/ReadMessage";
-			cle.ptszTooltip = szTip;
+			cle.szTooltip.w = szTip;
 			pcli->pfnAddEvent(&cle);
 
 			IcoLib_ReleaseIcon(cle.hIcon);
@@ -262,8 +262,8 @@ static void RestoreUnreadMessageAlerts(void)
 	CLISTEVENT cle = {};
 	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
 	cle.pszService = "SRMsg/ReadMessage";
-	cle.flags = CLEF_TCHAR;
-	cle.ptszTooltip = toolTip;
+	cle.flags = CLEF_UNICODE;
+	cle.szTooltip.w = toolTip;
 
 	for (int i = 0; i < arEvents.getCount(); i++) {
 		MSavedEvent &e = arEvents[i];
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index 6c7e4cadee..1fa4966af3 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -61,12 +61,12 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 				mir_snwprintf(tooltip, TranslateT("%s is online"), pcli->pfnGetContactDisplayName(hContact, 0));
 
 				CLISTEVENT cle = {};
-				cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
+				cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;
 				cle.hContact = hContact;
 				cle.hDbEvent = uniqueEventId++;
 				cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_USERONLINE, false);
 				cle.pszService = "UserOnline/Description";
-				cle.ptszTooltip = tooltip;
+				cle.szTooltip.w = tooltip;
 				pcli->pfnAddEvent(&cle);
 				IcoLib_ReleaseIcon(cle.hIcon, 0);
                 db_set_dw(cle.hContact, "UserOnline", "LastEvent", (DWORD)cle.hDbEvent);
-- 
cgit v1.2.3