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/Boltun/src/Engine/Mind.cpp | 14 +++++++------- plugins/Boltun/src/Engine/TalkEngine.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Boltun/src/Engine') diff --git a/plugins/Boltun/src/Engine/Mind.cpp b/plugins/Boltun/src/Engine/Mind.cpp index 120dbc85ef..cfee26fbf0 100644 --- a/plugins/Boltun/src/Engine/Mind.cpp +++ b/plugins/Boltun/src/Engine/Mind.cpp @@ -129,7 +129,7 @@ void Mind::Load(wstring filename) format(st); count = st.length(); c = co = new wchar_t[count + 1]; - mir_tstrcpy(c, st.c_str()); + mir_wstrcpy(c, st.c_str()); size_t pos = 0; while (pos < count && iswspace(*c)) { ++pos; @@ -209,25 +209,25 @@ void Mind::Load(wstring filename) ++c; count -= 2; c[count] = '\0'; - if (mir_tstrcmp(c, L"QUESTION") == 0) { + if (mir_wstrcmp(c, L"QUESTION") == 0) { toLowerStr(c); data->question.insert(s1); } - else if (mir_tstrcmp(c, L"IGNORED") == 0) { + else if (mir_wstrcmp(c, L"IGNORED") == 0) { toLowerStr(c); data->special.insert(s1); } - else if (mir_tstrcmp(c, L"ESCAPE") == 0) { + else if (mir_wstrcmp(c, L"ESCAPE") == 0) { data->escape.push_back(s1); } - else if (mir_tstrcmp(c, L"FAILURE") == 0) { + else if (mir_wstrcmp(c, L"FAILURE") == 0) { data->failure.push_back(s1); } - else if (mir_tstrcmp(c, L"REPEAT") == 0) { + else if (mir_wstrcmp(c, L"REPEAT") == 0) { data->repeats.push_back(s1); } else { - if (mir_tstrcmp(c, L"INITIAL") != 0) + if (mir_wstrcmp(c, L"INITIAL") != 0) throw error; data->initial.push_back(s1); } diff --git a/plugins/Boltun/src/Engine/TalkEngine.cpp b/plugins/Boltun/src/Engine/TalkEngine.cpp index 0f53403003..7d1ca265ed 100644 --- a/plugins/Boltun/src/Engine/TalkEngine.cpp +++ b/plugins/Boltun/src/Engine/TalkEngine.cpp @@ -264,7 +264,7 @@ wstring TalkBot::AllReplies(const wstring &incomingMessage, ContactData *contact TalkBot::MessageInfo* TalkBot::Reply(MCONTACT contact, wstring incomingMessage, bool saveChoice) { wchar_t* str = new wchar_t[incomingMessage.length() + 1]; - mir_tstrcpy(str, incomingMessage.c_str()); + mir_wstrcpy(str, incomingMessage.c_str()); CharLower(str); incomingMessage = str; delete[] str; -- cgit v1.2.3