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 --- protocols/IRCG/src/scripting.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/IRCG/src/scripting.cpp') diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp index 1620b46e24..9813630002 100644 --- a/protocols/IRCG/src/scripting.cpp +++ b/protocols/IRCG/src/scripting.cpp @@ -26,7 +26,7 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertRawIn(WPARAM, LPARAM lParam) char* pszRaw = (char*)lParam; if (m_scriptingEnabled && pszRaw && IsConnected()) { - wchar_t* p = mir_a2t(pszRaw); + wchar_t* p = mir_a2u(pszRaw); InsertIncomingEvent(p); mir_free(p); return 0; @@ -117,7 +117,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) int i = sString.Find("|"); if (i != -1) { sRequest = sString.Mid(0, i); - wchar_t* p = mir_a2t(sString.Mid(i + 1)); + wchar_t* p = mir_a2u(sString.Mid(i + 1)); sChannel = p; mir_free(p); } @@ -149,7 +149,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) gci.pszID = S.c_str(); if (!CallServiceSync(MS_GC_GETINFO, 0, (LPARAM)&gci)) { wchar_t szTemp[40]; - mir_sntprintf(szTemp, L"%u", gci.iCount); + mir_snwprintf(szTemp, L"%u", gci.iCount); sOutput = szTemp; } } @@ -173,7 +173,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) gci.pszModule = m_szModuleName; gci.iItem = j; if (!CallServiceSync(MS_GC_GETINFO, 0, (LPARAM)&gci)) { - if (mir_tstrcmpi(gci.pszID, SERVERWINDOW)) { + if (mir_wstrcmpi(gci.pszID, SERVERWINDOW)) { CMString S1 = gci.pszID; int k = S1.Find(L" "); if (k != -1) @@ -190,7 +190,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) } // send it to mbot if (!sOutput.IsEmpty()) - return (INT_PTR)mir_t2a(sOutput.c_str()); + return (INT_PTR)mir_u2a(sOutput.c_str()); } return 0; } -- cgit v1.2.3