forgotten TCHAR removed

12 files changed, 31 insertions, 31 deletions

diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index d9bb0ed360..897cd13df8 100755
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
@@ -627,8 +627,8 @@ void DoAlarm(ALARM *alarm)
 		if (alarm->action & AAF_SYSTRAY) {

 			CLISTEVENT cle = {};

 			cle.hIcon = hIconSystray;

-			cle.ptszTooltip = alarm->szTitle;

-			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

+			cle.szTooltip.w = alarm->szTitle;

+			cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;

 			pcli->pfnAddEvent(&cle);

 		}

 	}

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 005b8c9343..83b36d2630 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -282,12 +282,12 @@ void ReturnNotify(MCONTACT hContact, wchar_t *message)
 		cle.hContact = hContact;

 		cle.hIcon = hIcon;

 		cle.pszService = "BuddyExpectator/actionReturned";

-		cle.flags = CLEF_TCHAR;

+		cle.flags = CLEF_UNICODE;

 

 		wchar_t* nick = (wchar_t*)pcli->pfnGetContactDisplayName(hContact, 0);

 		wchar_t tmpMsg[512];

 		mir_snwprintf(tmpMsg, L"%s %s", nick, message);

-		cle.ptszTooltip = tmpMsg;

+		cle.szTooltip.w = tmpMsg;

 		pcli->pfnAddEvent(&cle);

 	}

 }

@@ -324,8 +324,8 @@ void GoneNotify(MCONTACT hContact, wchar_t *message)
 		wchar_t* nick = (wchar_t*)pcli->pfnGetContactDisplayName(hContact, 0);

 		wchar_t tmpMsg[512];

 		mir_snwprintf(tmpMsg, L"%s %s", nick, message);

-		cle.ptszTooltip = tmpMsg;

-		cle.flags = CLEF_TCHAR;

+		cle.szTooltip.w = tmpMsg;

+		cle.flags = CLEF_UNICODE;

 		pcli->pfnAddEvent(&cle);

 	}

 }

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index e13363c3ff..23500aa6f3 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -81,7 +81,7 @@ static int HookDBEventAdded(WPARAM hContact, LPARAM hDbEvent)
 		cle.hDbEvent = hDbEvent;

 		cle.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));

 		cle.pszService = MS_CONTACTS_RECEIVE;

-		cle.ptszTooltip = caToolTip;

+		cle.szTooltip.w = caToolTip;

 		cle.flags |= CLEF_UNICODE;

 		pcli->pfnAddEvent(&cle);

 	}

diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp
index e315d4e3bd..eb99a41ec4 100644
--- a/plugins/GmailNotifier/src/notify.cpp
+++ b/plugins/GmailNotifier/src/notify.cpp
@@ -95,7 +95,7 @@ void NotifyUser(Account *curAcc)
 			cle.flags = CLEF_URGENT;

 			cle.hIcon = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_OCCUPIED);

 			cle.pszService = "GmailMNotifier/Notifying";

-			cle.pszTooltip = curAcc->results.next->content;

+			cle.szTooltip.a = curAcc->results.next->content;

 			pcli->pfnAddEvent(&cle);

 		}

 

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 0e2a271722..d39b141107 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -311,12 +311,12 @@ void GetStatusText(MCONTACT hContact, WORD newStatus, WORD oldStatus, wchar_t *s
 void BlinkIcon(MCONTACT hContact, HICON hIcon, wchar_t *stzText)

 {

 	CLISTEVENT cle = {};

-	cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

+	cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;

 	cle.hContact = hContact;

 	cle.hDbEvent = hContact;

 	cle.hIcon = hIcon;

 	cle.pszService = "UserOnline/Description";

-	cle.ptszTooltip = stzText;

+	cle.szTooltip.w = stzText;

 	pcli->pfnAddEvent(&cle);

 }

 

diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 0db6a9384e..f999000d78 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -528,7 +528,7 @@ static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound)
 		ev.flags = CLEF_URGENT;

 		ev.lParam = (LPARAM)pReminder->uid;

 		ev.pszService = MODULENAME"/OpenTriggeredReminder";

-		ev.pszTooltip = Translate("Reminder");

+		ev.szTooltip.a = Translate("Reminder");

 		pcli->pfnAddEvent(&ev);

 	}

 

diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index e5e0233eda..28ad76e8c0 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -234,12 +234,12 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 				mir_snwprintf(szToolTip, TranslateT("SMS Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 				CLISTEVENT cle = {};

-				cle.flags = CLEF_TCHAR;

+				cle.flags = CLEF_UNICODE;

 				cle.hContact = hContact;

 				cle.hDbEvent = hDbEvent;

 				cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_SMS);

 				cle.pszService = szServiceFunction;

-				cle.ptszTooltip = szToolTip;

+				cle.szTooltip.w = szToolTip;

 				pcli->pfnAddEvent(&cle);

 			}

 		}

@@ -257,12 +257,12 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 				mir_snwprintf(szToolTip, TranslateT("SMS Confirmation from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 				CLISTEVENT cle = {};

-				cle.flags = CLEF_TCHAR;

+				cle.flags = CLEF_UNICODE;

 				cle.hContact = hContact;

 				cle.hDbEvent = hDbEvent;

 				cle.hIcon = (HICON)LoadImage(ssSMSSettings.hInstance, MAKEINTRESOURCE(iIcon), IMAGE_ICON, 0, 0, LR_SHARED);

 				cle.pszService = szServiceFunction;

-				cle.ptszTooltip = szToolTip;

+				cle.szTooltip.w = szToolTip;

 				pcli->pfnAddEvent(&cle);

 			}

 		}

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 0ef3c03a53..92f756e8f2 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -118,12 +118,12 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 		mir_snwprintf(toolTip, TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 		CLISTEVENT cle = {};

-		cle.flags = CLEF_TCHAR;

+		cle.flags = CLEF_UNICODE;

 		cle.hContact = hContact;

 		cle.hDbEvent = hDbEvent;

 		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 		cle.pszService = "SRMsg/ReadMessage";

-		cle.ptszTooltip = toolTip;

+		cle.szTooltip.w = toolTip;

 		pcli->pfnAddEvent(&cle);

 	}

 	return 0;

@@ -201,10 +201,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 = GetCachedIcon("scriver_TYPING");

 			cle.pszService = "SRMsg/TypingMessage";

-			cle.ptszTooltip = szTip;

+			cle.szTooltip.w = szTip;

 			pcli->pfnAddEvent(&cle);

 		}

 		else Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);

@@ -271,8 +271,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/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 43b577fcf9..64b280b13e 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -536,8 +536,8 @@ void CGlobals::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/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index f80288b3bf..dc388238bb 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -309,10 +309,10 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode)
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
 			cle.hDbEvent = 1;
-			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
+			cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;
 			cle.hIcon = PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING];
 			cle.pszService = "SRMsg/TypingMessage";
-			cle.ptszTooltip = szTip;
+			cle.szTooltip.w = szTip;
 			pcli->pfnAddEvent(&cle);
 		}
 	}
@@ -540,12 +540,12 @@ nowindowcreate:
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
 			cle.hDbEvent = hDbEvent;
-			cle.flags = CLEF_TCHAR;
+			cle.flags = CLEF_UNICODE;
 			cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
 			cle.pszService = "SRMsg/ReadMessage";
 			contactName = pcli->pfnGetContactDisplayName(hContact, 0);
 			mir_snwprintf(toolTip, TranslateT("Message from %s"), contactName);
-			cle.ptszTooltip = toolTip;
+			cle.szTooltip.w = toolTip;
 			pcli->pfnAddEvent(&cle);
 		}
 		tabSRMM_ShowPopup(hContact, hDbEvent, dbei.eventType, 0, 0, 0, dbei.szModule);
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 94e317b8e6..83f3c91491 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -312,7 +312,7 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt)
 

 	CLISTEVENT cle = {};

 	cle.hContact = hContact;

-	cle.flags = CLEF_URGENT|CLEF_TCHAR;

+	cle.flags = CLEF_URGENT|CLEF_UNICODE;

 	cle.hDbEvent = NULL;

 

 	switch (evt._eType) {

@@ -329,7 +329,7 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt)
 	default:

 		return;

 	}

-	cle.ptszTooltip = szMsg;

+	cle.szTooltip.w = szMsg;

 

 	// pszService = NULL get error (crash),

 	// pszService = "dummy" get 'service not fount' and continue;

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index 606622e27f..64b7508f92 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -638,13 +638,13 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 
 		if (!(nflags & YAMN_ACC_CONTNOEVENT)) {
 			CLISTEVENT evt = {};
-			evt.flags = CLEF_TCHAR;
+			evt.flags = CLEF_UNICODE;
 			evt.hContact = ActualAccount->hContact;
 			evt.hIcon = g_LoadIconEx(2);
 			evt.hDbEvent = ActualAccount->hContact;
 			evt.lParam = ActualAccount->hContact;
 			evt.pszService = MS_YAMN_CLISTDBLCLICK;
-			evt.ptszTooltip = tszMsg;
+			evt.szTooltip.w = tszMsg;
 			pcli->pfnAddEvent(&evt);
 		}
 		db_set_ws(ActualAccount->hContact, "CList", "StatusMsg", tszMsg);