From e2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 22 May 2015 16:04:17 +0000 Subject: T2Utf - handy replacement for ptrA git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/main.cpp | 16 ++++++---------- plugins/NewXstatusNotify/src/utils.cpp | 6 +----- plugins/NewXstatusNotify/src/xstatus.cpp | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index d7e7e25505..a98bf4b3cf 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -262,9 +262,8 @@ bool SkipHiddenContact(MCONTACT hContact) void LogSMsgToDB(STATUSMSGINFO *smi, const TCHAR *tmplt) { - TCHAR *str = GetStr(smi, tmplt); - - char *blob = mir_utf8encodeT(str); + ptrT str(GetStr(smi, tmplt)); + T2Utf blob(str); DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); @@ -276,8 +275,6 @@ void LogSMsgToDB(STATUSMSGINFO *smi, const TCHAR *tmplt) dbei.timestamp = (DWORD)time(NULL); dbei.szModule = MODULE; MEVENT hDBEvent = db_event_add(smi->hContact, &dbei); - mir_free(blob); - mir_free(str); if (opt.SMsgLogToDB_WinOpen && opt.SMsgLogToDB_Remove) { DBEVENT *dbevent = (DBEVENT *)mir_alloc(sizeof(DBEVENT)); @@ -353,7 +350,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus) if (opt.LogToDB && (!opt.LogToDB_WinOpen || CheckMsgWnd(hContact))) { TCHAR stzStatusText[MAX_SECONDLINE] = { 0 }; GetStatusText(hContact, newStatus, oldStatus, stzStatusText); - char *blob = mir_utf8encodeT(stzStatusText); + T2Utf blob(stzStatusText); DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); @@ -365,7 +362,6 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus) dbei.timestamp = (DWORD)time(NULL); dbei.szModule = MODULE; MEVENT hDBEvent = db_event_add(hContact, &dbei); - mir_free(blob); if (opt.LogToDB_WinOpen && opt.LogToDB_Remove) { DBEVENT *dbevent = (DBEVENT *)mir_alloc(sizeof(DBEVENT)); @@ -636,11 +632,11 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact) if (_stricmp(szProto, "mRadio") == 0 && !cws->value.type == DBVT_DELETED) { TCHAR buf[MAX_PATH]; mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("connecting")); - ptrA pszUtf(mir_utf8encodeT(buf)); + T2Utf pszUtf(buf); mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("aborting")); - ptrA pszUtf2(mir_utf8encodeT(buf)); + T2Utf pszUtf2(buf); mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("playing")); - ptrA pszUtf3(mir_utf8encodeT(buf)); + T2Utf pszUtf3(buf); if (_stricmp(cws->value.pszVal, pszUtf) == 0 || _stricmp(cws->value.pszVal, pszUtf2) == 0 || _stricmp(cws->value.pszVal, pszUtf3) == 0) goto skip_notify; } diff --git a/plugins/NewXstatusNotify/src/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp index 951a2dd551..7dd1e9dc58 100644 --- a/plugins/NewXstatusNotify/src/utils.cpp +++ b/plugins/NewXstatusNotify/src/utils.cpp @@ -87,11 +87,7 @@ void LogToFile(TCHAR *stzText) { FILE *fp = _tfopen(opt.LogFilePath, _T("a+b, ccs=UTF-8")); if (fp) { - char *encodedText = mir_utf8encodeT(stzText); - if (encodedText) { - fprintf(fp, encodedText); - mir_free(encodedText); - } + fprintf(fp, T2Utf(stzText)); fclose(fp); } } diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 07bfbf22be..911c595945 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -294,7 +294,7 @@ void LogChangeToDB(XSTATUSCHANGE *xsc) if (opt.XLogToDB) { db_set_ws(xsc->hContact, MODULE, DB_LASTLOG, stzLogText); - ptrA blob(mir_utf8encodeT(stzLogText)); + T2Utf blob(stzLogText); DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); -- cgit v1.2.3