From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/popup.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/NewXstatusNotify/src/popup.cpp') diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index c4aad62f4f..a6346e67d9 100644 --- a/plugins/NewXstatusNotify/src/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" -void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const TCHAR *stzText, PLUGINDATA *pdp) +void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar_t *stzText, PLUGINDATA *pdp) { POPUPDATAT ppd = { 0 }; ppd.lchContact = hContact; @@ -34,9 +34,9 @@ void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const TCHAR if (tszGroup) buf.AppendFormat(L" (%s)", tszGroup); } - _tcsncpy_s(ppd.lptzContactName, buf, _TRUNCATE); + wcsncpy_s(ppd.lptzContactName, buf, _TRUNCATE); - _tcsncpy(ppd.lptzText, stzText, _countof(ppd.lptzText)); + wcsncpy(ppd.lptzText, stzText, _countof(ppd.lptzText)); switch (opt.Colors) { case POPUP_COLOR_OWN: @@ -79,15 +79,15 @@ static int AwayMsgHook(WPARAM, LPARAM lParam, LPARAM pObj) MCONTACT hContact = PUGetContact(pdp->hWnd); ptrT pstzLast(db_get_tsa(hContact, MODULE, "LastPopupText")); - TCHAR *tszStatus = (TCHAR *)ack->lParam; + wchar_t *tszStatus = (wchar_t *)ack->lParam; if (tszStatus == NULL || *tszStatus == 0) return 0; - TCHAR stzText[1024]; + wchar_t stzText[1024]; if (pstzLast) mir_sntprintf(stzText, L"%s\n%s", pstzLast, tszStatus); else - _tcsncpy(stzText, tszStatus, _countof(stzText)); + wcsncpy(stzText, tszStatus, _countof(stzText)); SendMessage(pdp->hWnd, WM_SETREDRAW, FALSE, 0); PUChangeTextT(pdp->hWnd, stzText); SendMessage(pdp->hWnd, WM_SETREDRAW, TRUE, 0); -- cgit v1.2.3