diff options
author | George Hazan <george.hazan@gmail.com> | 2015-05-22 16:04:17 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-05-22 16:04:17 +0000 |
commit | e2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 (patch) | |
tree | ba79bdcede96f80039f8b88d2791f198b9ec2981 /plugins/Clist_modern/src/modern_clcpaint.cpp | |
parent | f8e34b5f83f3ce5f39d541e9068b6b8cb6d92acd (diff) |
T2Utf - handy replacement for ptrA<mir_utf8decodeT()>
git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clcpaint.cpp')
-rw-r--r-- | plugins/Clist_modern/src/modern_clcpaint.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index cca4d6844b..840ffd7ca3 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -642,28 +642,21 @@ MODERNMASK *CLCPaint::_GetCLCContactRowBackModernMask(ClcGroup *group, ClcContac _itoa(index, buf, BUF2SIZE);
AddParam(mpModernMask, HASH[hi_Index], buf, 0);
{
- TCHAR *b2 = mir_tstrdup(Drawing->szText);
- int i, m = (int)mir_tstrlen(b2);
- for (i = 0; i < m; i++)
+ TCHAR *b2 = NEWTSTR_ALLOCA(Drawing->szText);
+ for (int i = 0; b2[i] != 0; i++)
if (b2[i] == _T(','))
b2[i] = _T('.');
- char* b3 = mir_utf8encodeT(b2);
- AddParam(mpModernMask, HASH[hi_Name], b3, 0);
- mir_free(b3);
- mir_free(b2);
+ AddParam(mpModernMask, HASH[hi_Name], T2Utf(b2), 0);
}
if (group->parent) {
- TCHAR *b2 = mir_tstrdup(group->parent->cl.items[0]->szText);
- int i, m = (int)mir_tstrlen(b2);
- for (i = 0; i < m; i++)
- if (b2[i] == _T(',')) b2[i] = _T('.');
-
- char * b3 = mir_utf8encodeT(b2);
- AddParam(mpModernMask, HASH[hi_Group], b3, 0);
- mir_free(b3);
- mir_free(b2);
+ TCHAR *b2 = NEWTSTR_ALLOCA(group->parent->cl.items[0]->szText);
+ for (int i = 0; b2[i] != 0; i++)
+ if (b2[i] == _T(','))
+ b2[i] = _T('.');
+
+ AddParam(mpModernMask, HASH[hi_Group], T2Utf(b2), 0);
}
return mpModernMask;
}
|