From 4aa6229698b946e52ce19018aaf13f8b92fb168e Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 14:13:45 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/findadd/searchresults.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/modules/findadd') diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp index 827fe920b0..ab5fd3fdf8 100644 --- a/src/modules/findadd/searchresults.cpp +++ b/src/modules/findadd/searchresults.cpp @@ -86,12 +86,8 @@ void LoadColumnSizes(HWND hwndResults, const char *szProto) { if (szProto) { - #if defined( _UNICODE ) - bNeedsFree = TRUE; - lvc.pszText = mir_a2t((char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDTEXT, 0)); - #else - lvc.pszText = (char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDTEXT, 0); - #endif + bNeedsFree = TRUE; + lvc.pszText = mir_a2t((char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDTEXT, 0)); } else lvc.pszText = _T("ID"); @@ -100,10 +96,9 @@ void LoadColumnSizes(HWND hwndResults, const char *szProto) mir_snprintf(szSetting, SIZEOF(szSetting), "ColWidth%d", i); lvc.cx = DBGetContactSettingWord(NULL, "FindAdd", szSetting, defaultColumnSizes[i]); ListView_InsertColumn(hwndResults, i, (LPARAM)&lvc); - #if defined( _UNICODE ) - if (bNeedsFree) + + if (bNeedsFree) mir_free(lvc.pszText); - #endif } mir_snprintf(szSetting, SIZEOF(szSetting), "ColOrder%d", i); columnOrder[i] = DBGetContactSettingByte(NULL, "FindAdd", szSetting, -1); -- cgit v1.2.3