diff options
| author | George Hazan <ghazan@miranda.im> | 2019-07-24 20:58:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-07-24 20:58:58 +0300 |
| commit | ed4897b7ef69e862806a8c07f1fd475262d0c36e (patch) | |
| tree | 414efc6365f455122956eac74b754505c8efaf15 /protocols/VKontakte/src/vk_chats.cpp | |
| parent | 99893bf3aec9f4e9f0c4844c0987d129e1778c7e (diff) | |
massive warning fix
Diffstat (limited to 'protocols/VKontakte/src/vk_chats.cpp')
| -rw-r--r-- | protocols/VKontakte/src/vk_chats.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index fc9c834ad1..069bbc1142 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -306,7 +306,7 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode & if (wszAction == L"chat_create") {
CMStringW wszActionText = jnMsg["action_text"].as_mstring();
- wszBody.AppendFormat(L"%s \"%s\"", TranslateT("create chat"), wszActionText.IsEmpty() ? L" " : wszActionText);
+ wszBody.AppendFormat(L"%s \"%s\"", TranslateT("create chat"), wszActionText.IsEmpty() ? L" " : wszActionText.c_str());
}
else if (wszAction == L"chat_kick_user") {
CMStringW wszActionMid = jnMsg["action_mid"].as_mstring();
@@ -327,10 +327,9 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode & if (cu == nullptr)
wszBody.AppendFormat(L"%s (%s)", TranslateT("kick user"), UserProfileUrl(a_uid).c_str());
else
- wszBody.AppendFormat(L"%s %s (%s)", TranslateT("kick user"), cu->m_wszNick, UserProfileUrl(a_uid).c_str());
+ wszBody.AppendFormat(L"%s %s (%s)", TranslateT("kick user"), cu->m_wszNick.get(), UserProfileUrl(a_uid).c_str());
}
- else
- wszBody = TranslateT("kick user");
+ else wszBody = TranslateT("kick user");
}
}
}
@@ -350,16 +349,15 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode & if (cu == nullptr)
wszBody.AppendFormat(L"%s (%s)", TranslateT("invite user"), UserProfileUrl(a_uid).c_str());
else
- wszBody.AppendFormat(L"%s %s (%s)", TranslateT("invite user"), cu->m_wszNick, UserProfileUrl(a_uid).c_str());
+ wszBody.AppendFormat(L"%s %s (%s)", TranslateT("invite user"), cu->m_wszNick.get(), UserProfileUrl(a_uid).c_str());
}
- else
- wszBody = TranslateT("invite user");
+ else wszBody = TranslateT("invite user");
}
}
}
else if (wszAction == L"chat_title_update") {
CMStringW wszTitle = jnMsg["action_text"].as_mstring();
- wszBody.AppendFormat(L"%s \"%s\"", TranslateT("change chat title to"), wszTitle.IsEmpty() ? L" " : wszTitle);
+ wszBody.AppendFormat(L"%s \"%s\"", TranslateT("change chat title to"), wszTitle.IsEmpty() ? L" " : wszTitle.c_str());
if (!bIsHistory)
SetChatTitle(cc, wszTitle);
@@ -852,7 +850,7 @@ void CVkProto::ChatContactTypingThread(void *p) m_ChatsTyping.remove(cp);
m_ChatsTyping.insert(param);
- Srmm_SetStatusText(hChatContact, CMStringW(FORMAT, TranslateT("%s is typing a message..."), cu->m_wszNick));
+ Srmm_SetStatusText(hChatContact, CMStringW(FORMAT, TranslateT("%s is typing a message..."), cu->m_wszNick.get()));
}
Sleep(9500);
|