forgotten TCHAR removed

6 files changed, 19 insertions, 19 deletions

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);

diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp
index 43b6c7791a..1c17da6fee 100644
--- a/src/mir_app/src/chat_clist.cpp
+++ b/src/mir_app/src/chat_clist.cpp
@@ -203,10 +203,10 @@ BOOL AddEvent(MCONTACT hContact, HICON hIcon, MEVENT hEvent, int type, wchar_t*
 	CLISTEVENT cle = {};

 	cle.hContact = hContact;

 	cle.hDbEvent = hEvent;

-	cle.flags = type | CLEF_TCHAR;

+	cle.flags = type | CLEF_UNICODE;

 	cle.hIcon = hIcon;

 	cle.pszService = "GChat/DblClickEvent";

-	cle.ptszTooltip = TranslateW(szBuf);

+	cle.szTooltip.w = TranslateW(szBuf);

 

 	if (!ServiceExists(cle.pszService))

 		CreateServiceFunction(cle.pszService, &EventDoubleclicked);

diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp
index bcc85e9840..5b8b01f5b1 100644
--- a/src/mir_app/src/clistevents.cpp
+++ b/src/mir_app/src/clistevents.cpp
@@ -68,7 +68,7 @@ static char* GetEventProtocol(int idx)
 

 static void ShowOneEventInTray(int idx)

 {

-	cli.pfnTrayIconUpdateWithImageList((iconsOn || disableTrayFlash) ? g_cliEvents[idx].imlIconIndex : 0, g_cliEvents[idx].ptszTooltip, GetEventProtocol(idx));

+	cli.pfnTrayIconUpdateWithImageList((iconsOn || disableTrayFlash) ? g_cliEvents[idx].imlIconIndex : 0, g_cliEvents[idx].szTooltip.w, GetEventProtocol(idx));

 }

 

 static void ShowEventsInTray()

@@ -150,9 +150,9 @@ CListEvent* fnAddEvent(CLISTEVENT *cle)
 	p->flashesDone = 12;

 	p->pszService = mir_strdup(g_cliEvents[i].pszService);

 	if (p->flags & CLEF_UNICODE)

-		p->ptszTooltip = mir_wstrdup(p->ptszTooltip);

+		p->szTooltip.w = mir_wstrdup(p->szTooltip.w);

 	else

-		p->ptszTooltip = mir_a2u(p->pszTooltip); //if no flag defined it handled as unicode

+		p->szTooltip.w = mir_a2u(p->szTooltip.a); //if no flag defined it handled as unicode

 	if (g_cliEvents.getCount() == 1) {

 		char *szProto;

 		if (cle->hContact == 0) {

@@ -165,7 +165,7 @@ CListEvent* fnAddEvent(CLISTEVENT *cle)
 

 		iconsOn = 1;

 		flashTimerId = SetTimer(nullptr, 0, db_get_w(0, "CList", "IconFlashTime", 550), IconFlashTimer);

-		cli.pfnTrayIconUpdateWithImageList(p->imlIconIndex, p->ptszTooltip, szProto);

+		cli.pfnTrayIconUpdateWithImageList(p->imlIconIndex, p->szTooltip.w, szProto);

 	}

 	cli.pfnChangeContactIcon(cle->hContact, p->imlIconIndex);

 	return p;

@@ -218,7 +218,7 @@ int fnRemoveEvent(MCONTACT hContact, MEVENT dbEvent)
 			szProto = nullptr;

 		else

 			szProto = GetContactProto(g_cliEvents[0].hContact);

-		cli.pfnTrayIconUpdateWithImageList(iconsOn ? g_cliEvents[0].imlIconIndex : 0, g_cliEvents[0].ptszTooltip, szProto);

+		cli.pfnTrayIconUpdateWithImageList(iconsOn ? g_cliEvents[0].imlIconIndex : 0, g_cliEvents[0].szTooltip.w, szProto);

 	}

 

 	return 0;