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/StopSpamPlus/src/options.cpp | 4 ++-- plugins/StopSpamPlus/src/services.cpp | 6 +++--- plugins/StopSpamPlus/src/stdafx.h | 4 ++-- plugins/StopSpamPlus/src/stopspam.cpp | 2 +- plugins/StopSpamPlus/src/utils.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/StopSpamPlus') diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp index 03105de55d..3feb724e8f 100644 --- a/plugins/StopSpamPlus/src/options.cpp +++ b/plugins/StopSpamPlus/src/options.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -TCHAR * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you."); -TCHAR const * infTalkProtPrefix = TranslateT("StopSpam automatic message:\r\n"); +wchar_t * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you."); +wchar_t const * infTalkProtPrefix = TranslateT("StopSpam automatic message:\r\n"); char const * answeredSetting = "Answered"; char const * questCountSetting = "QuestionCount"; diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp index 9b821b1aa3..5026af7098 100644 --- a/plugins/StopSpamPlus/src/services.cpp +++ b/plugins/StopSpamPlus/src/services.cpp @@ -27,7 +27,7 @@ INT_PTR RemoveTempContacts(WPARAM, LPARAM lParam) MCONTACT hNext = db_find_next(hContact); ptrT szGroup(db_get_tsa(hContact, "CList", "Group")); - if (db_get_b(hContact, "CList", "NotOnList", 0) || (szGroup != NULL && (_tcsstr(szGroup, L"Not In List") || _tcsstr(szGroup, TranslateT("Not In List"))))) { + if (db_get_b(hContact, "CList", "NotOnList", 0) || (szGroup != NULL && (wcsstr(szGroup, L"Not In List") || wcsstr(szGroup, TranslateT("Not In List"))))) { char *szProto = GetContactProto(hContact); if (szProto != NULL) { // Check if protocol uses server side lists @@ -47,10 +47,10 @@ INT_PTR RemoveTempContacts(WPARAM, LPARAM lParam) } int hGroup = 1; - TCHAR *group_name; + wchar_t *group_name; do { group_name = Clist_GroupGetName(hGroup, 0); - if (group_name != NULL && _tcsstr(group_name, TranslateT("Not In List"))) { + if (group_name != NULL && wcsstr(group_name, TranslateT("Not In List"))) { BYTE ConfirmDelete = db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT); if (ConfirmDelete) db_set_b(NULL, "CList", "ConfirmDelete", 0); diff --git a/plugins/StopSpamPlus/src/stdafx.h b/plugins/StopSpamPlus/src/stdafx.h index b22afebe4d..8e521c120d 100644 --- a/plugins/StopSpamPlus/src/stdafx.h +++ b/plugins/StopSpamPlus/src/stdafx.h @@ -32,8 +32,8 @@ typedef std::wstring tstring; #define pluginName LPGEN("StopSpam") -extern TCHAR * pluginDescription; -extern TCHAR const * infTalkProtPrefix; +extern wchar_t * pluginDescription; +extern wchar_t const * infTalkProtPrefix; extern char const * answeredSetting; extern char const * questCountSetting; extern HANDLE hLoadHook; diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index 13fd6dbd21..ccd407d3d5 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -54,7 +54,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.position = -0x7FFFFFFF; mi.flags = CMIF_TCHAR; mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); - mi.name.t = LPGENT("Remove Temporary Contacts"); + mi.name.w = LPGENW("Remove Temporary Contacts"); mi.pszService = pluginName"/RemoveTempContacts"; Menu_AddMainMenuItem(&mi); diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp index 0b617519da..f5ea232f94 100644 --- a/plugins/StopSpamPlus/src/utils.cpp +++ b/plugins/StopSpamPlus/src/utils.cpp @@ -4,7 +4,7 @@ tstring &GetDlgItemString(HWND hwnd, int id) { HWND h = GetDlgItem(hwnd, id); int len = GetWindowTextLength(h); - TCHAR * buf = new TCHAR[len + 1]; + wchar_t * buf = new wchar_t[len + 1]; GetWindowText(h, buf, len + 1); static tstring s; s = buf; @@ -48,10 +48,10 @@ tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact){ memset(&fi, 0, sizeof(fi)); fi.cbSize = sizeof(fi); - fi.tszFormat = _tcsdup(tstrFormat.c_str()); + fi.tszFormat = wcsdup(tstrFormat.c_str()); fi.hContact = hContact; fi.flags |= FIF_TCHAR; - TCHAR *tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0); + wchar_t *tszParsed = (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0); free(fi.tszFormat); if (tszParsed) { tstrResult = tszParsed; -- cgit v1.2.3