From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StopSpamPlus/src/services.cpp | 2 +- plugins/StopSpamPlus/src/settings.cpp | 4 ++-- plugins/StopSpamPlus/src/settings.h | 6 +++--- plugins/StopSpamPlus/src/stopspam.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/StopSpamPlus/src') diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp index 3d022a2ba8..54c0019486 100644 --- a/plugins/StopSpamPlus/src/services.cpp +++ b/plugins/StopSpamPlus/src/services.cpp @@ -25,7 +25,7 @@ INT_PTR RemoveTempContacts(WPARAM, LPARAM lParam) { for (MCONTACT hContact = db_find_first(); hContact;) { MCONTACT hNext = db_find_next(hContact); - ptrW szGroup(db_get_tsa(hContact, "CList", "Group")); + ptrW szGroup(db_get_wsa(hContact, "CList", "Group")); 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); diff --git a/plugins/StopSpamPlus/src/settings.cpp b/plugins/StopSpamPlus/src/settings.cpp index 8e6e3cbbc6..d8f6e85ecd 100644 --- a/plugins/StopSpamPlus/src/settings.cpp +++ b/plugins/StopSpamPlus/src/settings.cpp @@ -4,7 +4,7 @@ tstring db_usage::DBGetPluginSetting(std::string const &name, tstring const &defValue) { DBVARIANT dbv; - if (db_get_ts(NULL, pluginName, name.c_str(), &dbv)) + if (db_get_ws(NULL, pluginName, name.c_str(), &dbv)) return defValue; tstring value = dbv.ptszVal; db_free(&dbv); @@ -36,7 +36,7 @@ DWORD db_usage::DBGetPluginSetting(std::string const &name, DWORD const &defValu //writting to database-------------- void db_usage::DBSetPluginSetting(std::string const &name, tstring const &value) { - db_set_ts(NULL, pluginName, name.c_str(), value.c_str()); + db_set_ws(NULL, pluginName, name.c_str(), value.c_str()); } diff --git a/plugins/StopSpamPlus/src/settings.h b/plugins/StopSpamPlus/src/settings.h index 22c005649e..8c364569b2 100644 --- a/plugins/StopSpamPlus/src/settings.h +++ b/plugins/StopSpamPlus/src/settings.h @@ -61,13 +61,13 @@ public: db_setting RemTmpAll; db_setting HistLog; - Settings():Question("Question",TranslateTS(L"Spammers made me to install small anti-spam system you are now speaking with. " + Settings():Question("Question",TranslateW(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" + ,AuthRepl("AuthReply",TranslateW(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" + ,Congratulation("Congratulation",TranslateW(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) diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index ccd407d3d5..d7c8a36953 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -52,7 +52,7 @@ extern "C" int __declspec(dllexport) Load(void) CMenuItem mi; SET_UID(mi, 0xf2164e17, 0xa4c1, 0x4b07, 0xae, 0x81, 0x9e, 0xae, 0x7f, 0xa2, 0x55, 0x13); mi.position = -0x7FFFFFFF; - mi.flags = CMIF_TCHAR; + mi.flags = CMIF_UNICODE; mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); mi.name.w = LPGENW("Remove Temporary Contacts"); mi.pszService = pluginName"/RemoveTempContacts"; -- cgit v1.2.3