T2Utf - handy replacement for ptrA<mir_utf8decodeT()>

git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 7 insertions, 7 deletions

diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp
index 0325794eb2..2068b64a44 100644
--- a/protocols/Tox/src/tox_multimedia.cpp
+++ b/protocols/Tox/src/tox_multimedia.cpp
@@ -291,14 +291,13 @@ void CToxProto::OnAvInvite(void*, int32_t callId, void *arg)
 

 	TCHAR message[MAX_PATH];

 	mir_sntprintf(message, SIZEOF(message), TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+	T2Utf szMessage(message);

 

 	PROTORECVEVENT recv = { 0 };

 	recv.timestamp = time(NULL);

 	recv.lParam = callId;

-	recv.szMessage = mir_utf8encodeT(message);

+	recv.szMessage = szMessage;

 	ProtoChainRecv(hContact, PSR_AUDIO, hContact, (LPARAM)&recv);

-

-	mir_free(recv.szMessage);

 }

 

 // save event to db

diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index ab48ce60a2..3891400c79 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -219,7 +219,7 @@ int CToxProto::SetAwayMsg(int, const PROTOCHAR *msg)
 {

 	if (IsOnline())

 	{

-		ptrA statusMessage(mir_utf8encodeT(msg));

+		T2Utf statusMessage(msg);

 		TOX_ERR_SET_INFO error;

 		if (tox_self_set_status_message(tox, (uint8_t*)(char*)statusMessage, min(TOX_MAX_STATUS_MESSAGE_LENGTH, mir_strlen(statusMessage)), &error))

 			debugLogA("CToxProto::SetAwayMsg: failed to set status status message %s (%d)", msg, error);

diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp
index 0eb8eca77e..c9962d90a0 100644
--- a/protocols/Tox/src/tox_search.cpp
+++ b/protocols/Tox/src/tox_search.cpp
@@ -190,7 +190,7 @@ HWND CToxProto::OnSearchAdvanced(HWND owner)
 	TCHAR text[MAX_PATH];

 	GetDlgItemText(owner, IDC_SEARCH, text, SIZEOF(text));

 

-	const std::string query = ptrA(mir_utf8encodeT(text));

+	const std::string query = T2Utf(text);

 	if (std::regex_search(query, match, regex))

 	{

 		std::string address = match[1];

diff --git a/protocols/Tox/src/tox_services.cpp b/protocols/Tox/src/tox_services.cpp
index 3b5ba18395..f42a3d35c0 100644
--- a/protocols/Tox/src/tox_services.cpp
+++ b/protocols/Tox/src/tox_services.cpp
@@ -3,10 +3,11 @@
 INT_PTR CToxProto::SetMyNickname(WPARAM wParam, LPARAM lParam)

 {

 	ptrT nickname((wParam & SMNN_UNICODE) ? mir_u2t((TCHAR*)lParam) : mir_a2t((char*)lParam));

-

 	setTString("Nick", nickname);

+

+	T2Utf szNick8(nickname);

 	TOX_ERR_SET_INFO error;

-	if (!tox_self_set_name(tox, (uint8_t*)(char*)ptrA(mir_utf8encodeT(nickname)), mir_tstrlen(nickname), &error))

+	if (!tox_self_set_name(tox, szNick8, mir_strlen(szNick8), &error))

 	{

 		debugLogA(__FUNCTION__": failed to set nick name");

 		return 1;