diff options
| author | George Hazan <ghazan@miranda.im> | 2017-01-16 18:19:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-01-16 18:19:15 +0300 |
| commit | df51f338983ba85feffcbd2209100c6927dda8a5 (patch) | |
| tree | 9f81c94034396b4c4e8496661b12b346798808cf /protocols/Tox | |
| parent | c00f494c8165b9f2d9facc6488173502b19ca696 (diff) | |
Utf8DecodeT/Utf8EncodeT macros considered useless and replaced with Utf8DecodeW/Utf8EncodeW
Diffstat (limited to 'protocols/Tox')
| -rw-r--r-- | protocols/Tox/src/tox_core.cpp | 4 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_options.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index 7ac8d3a55b..bae27a52e7 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -95,7 +95,7 @@ bool CToxProto::InitToxCore(CToxThread *toxThread) /*uint8_t nick[TOX_MAX_NAME_LENGTH] = { 0 };
tox_self_get_name(toxThread->Tox(), nick);
- setWString("Nick", ptrW(Utf8DecodeT((char*)nick)));*/
+ setWString("Nick", ptrW(Utf8DecodeW((char*)nick)));*/
ptrA nick(mir_utf8encodeW(ptrW(getWStringA("Nick"))));
tox_self_set_name(toxThread->Tox(), (uint8_t*)(char*)nick, mir_strlen(nick), &error);
@@ -107,7 +107,7 @@ bool CToxProto::InitToxCore(CToxThread *toxThread) /*uint8_t statusMessage[TOX_MAX_STATUS_MESSAGE_LENGTH] = { 0 };
tox_self_get_status_message(toxThread->Tox(), statusMessage);
- setWString("StatusMsg", ptrW(Utf8DecodeT((char*)statusMessage)));*/
+ setWString("StatusMsg", ptrW(Utf8DecodeW((char*)statusMessage)));*/
ptrA statusMessage(mir_utf8encodeW(ptrW(getWStringA("StatusMsg"))));
tox_self_set_status_message(toxThread->Tox(), (uint8_t*)(char*)statusMessage, mir_strlen(statusMessage), &error);
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 8a865f58fa..5e5e37492f 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -143,13 +143,13 @@ void CToxOptionsMain::ProfileImport_OnClick(CCtrlButton*) uint8_t nick[TOX_MAX_NAME_LENGTH] = { 0 };
tox_self_get_name(toxThread.Tox(), nick);
- ptrW nickname(Utf8DecodeT((char*)nick));
+ ptrW nickname(Utf8DecodeW((char*)nick));
m_proto->setWString("Nick", nickname);
m_nickname.SetText(nickname);
uint8_t statusMessage[TOX_MAX_STATUS_MESSAGE_LENGTH] = { 0 };
tox_self_get_status_message(toxThread.Tox(), statusMessage);
- m_proto->setWString("StatusMsg", ptrW(Utf8DecodeT((char*)statusMessage)));
+ m_proto->setWString("StatusMsg", ptrW(Utf8DecodeW((char*)statusMessage)));
ShowWindow(m_profileCreate.GetHwnd(), FALSE);
ShowWindow(m_profileImport.GetHwnd(), FALSE);
|