From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/notifications.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Popup/src/notifications.cpp') diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index 9958db8c7d..ad176ca7ed 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -29,9 +29,9 @@ HANDLE g_hntfError, g_hntfWarning, g_hntfNotification; int TreeDataSortFunc(const POPUPTREEDATA *p1, const POPUPTREEDATA *p2) { - if (int cmp = mir_tstrcmp(p1->pszTreeRoot, p2->pszTreeRoot)) + if (int cmp = mir_wstrcmp(p1->pszTreeRoot, p2->pszTreeRoot)) return cmp; - return mir_tstrcmp(p1->pszDescription, p2->pszDescription); + return mir_wstrcmp(p1->pszDescription, p2->pszDescription); } LIST gTreeData(20, TreeDataSortFunc); @@ -172,8 +172,8 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification) POPUPTREEDATA *ptd = (POPUPTREEDATA *)mir_alloc(sizeof(POPUPTREEDATA)); ptd->signature = PopupNotificationData_SIGNATURE; ptd->typ = 1; - ptd->pszTreeRoot = mir_a2t(notification->lpzGroup); - ptd->pszDescription = mir_a2t(notification->lpzName); + ptd->pszTreeRoot = mir_a2u(notification->lpzGroup); + ptd->pszDescription = mir_a2u(notification->lpzName); ptd->notification = *notification; ptd->hIcoLib = notification->lchIcoLib; if (!ptd->notification.lpzLAction) ptd->notification.lpzLAction = POPUP_ACTION_NOTHING; @@ -215,7 +215,7 @@ HANDLE FindTreeData(LPTSTR group, LPTSTR name, BYTE typ) { for (int i = 0; i < gTreeData.getCount(); i++) { POPUPTREEDATA *p = gTreeData[i]; - if (p->typ == typ && (!group || (mir_tstrcmp(p->pszTreeRoot, group) == 0)) && (!name || (mir_tstrcmp(p->pszDescription, name) == 0))) + if (p->typ == typ && (!group || (mir_wstrcmp(p->pszTreeRoot, group) == 0)) && (!name || (mir_wstrcmp(p->pszDescription, name) == 0))) return p; } return NULL; -- cgit v1.2.3