From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StopSpamPlus/src/services.cpp | 2 +- plugins/StopSpamPlus/src/settings.h | 18 +++++++++--------- plugins/StopSpamPlus/src/stdafx.h | 2 +- plugins/StopSpamPlus/src/utils.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/StopSpamPlus') diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp index 0310bb6c13..9b821b1aa3 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, _T("Not In List")) || _tcsstr(szGroup, TranslateT("Not In List"))))) { + if (db_get_b(hContact, "CList", "NotOnList", 0) || (szGroup != NULL && (_tcsstr(szGroup, L"Not In List") || _tcsstr(szGroup, TranslateT("Not In List"))))) { char *szProto = GetContactProto(hContact); if (szProto != NULL) { // Check if protocol uses server side lists diff --git a/plugins/StopSpamPlus/src/settings.h b/plugins/StopSpamPlus/src/settings.h index 9f2fbb8fbb..22c005649e 100644 --- a/plugins/StopSpamPlus/src/settings.h +++ b/plugins/StopSpamPlus/src/settings.h @@ -61,21 +61,21 @@ public: db_setting RemTmpAll; db_setting HistLog; - Settings():Question("Question",TranslateTS(_T("Spammers made me to install small anti-spam system you are now speaking with. ") - _T("Please reply \"nospam\" without quotes and spaces if you want to contact me.\r\n") - _T("Внимание! Антиспам защита. Ответьте \"nospam\" без кавычек и пробелов, если хотите связаться со мной."))) - ,AuthRepl("AuthReply",TranslateTS(_T("StopSpam: send a message and reply to a anti-spam bot question.\r\n") - _T("Антиспам: отправьте сообщение и ответьте на вопрос антиспам системы."))) - ,Answer("Answer",_T("nospam")) - ,Congratulation("Congratulation",TranslateTS(_T("Congratulations! You just passed human/robot test. Now you can write me a message.\r\n") - _T("Поздравляю! Вы прошли антиспам проверку. Теперь вы можете писать мне."))) + Settings():Question("Question",TranslateTS(L"Spammers made me to install small anti-spam system you are now speaking with. " + L"Please reply \"nospam\" without quotes and spaces if you want to contact me.\r\n" + L"Внимание! Антиспам защита. Ответьте \"nospam\" без кавычек и пробелов, если хотите связаться со мной.")) + ,AuthRepl("AuthReply",TranslateTS(L"StopSpam: send a message and reply to a anti-spam bot question.\r\n" + L"Антиспам: отправьте сообщение и ответьте на вопрос антиспам системы.")) + ,Answer("Answer",L"nospam") + ,Congratulation("Congratulation",TranslateTS(L"Congratulations! You just passed human/robot test. Now you can write me a message.\r\n" + L"Поздравляю! Вы прошли антиспам проверку. Теперь вы можете писать мне.")) ,DisabledProtoList("DisabledProtoList","MetaContacts RSSNews") ,InfTalkProtection("InfTalkProtection", 1) ,AddPermanent("AddPermanent", 0) ,HandleAuthReq("HandleAuthReq", 0) ,MaxQuestCount("MaxQuestCount", 2) ,AnswNotCaseSens("AnswNotCaseSens", 1) - ,AnswSplitString("AnswSplitString",_T("|")) + ,AnswSplitString("AnswSplitString",L"|") ,RemTmpAll("RemTmpAll", 1) ,HistLog("HistLog", 0) { diff --git a/plugins/StopSpamPlus/src/stdafx.h b/plugins/StopSpamPlus/src/stdafx.h index 1b2ac5b2e1..b22afebe4d 100644 --- a/plugins/StopSpamPlus/src/stdafx.h +++ b/plugins/StopSpamPlus/src/stdafx.h @@ -50,7 +50,7 @@ void SetDlgItemString(HWND hwndDlg, UINT idItem, std::wstring const &str); tstring &GetDlgItemString(HWND hwnd, int id); bool IsExistMyMessage(MCONTACT hContact); tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact); -tstring trim(tstring const &tstr, tstring const &trimChars = _T(" \f\n\r\t\v")); +tstring trim(tstring const &tstr, tstring const &trimChars = L" \f\n\r\t\v"); INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/); INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam); diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp index e9fa955ba7..0b617519da 100644 --- a/plugins/StopSpamPlus/src/utils.cpp +++ b/plugins/StopSpamPlus/src/utils.cpp @@ -68,7 +68,7 @@ tstring trim(const tstring &tstr, const tstring& trimChars) size_t e = tstr.find_last_not_of(trimChars); if ((tstring::npos == s) || (tstring::npos == e)) - return _T(""); + return L""; else return tstr.substr(s, e - s + 1); } \ No newline at end of file -- cgit v1.2.3