From 05c989e58aeffcfb59cebaca6797cb69dd25cb1e Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 14:33:30 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/parse_metacontacts.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'plugins/Variables/parse_metacontacts.cpp') diff --git a/plugins/Variables/parse_metacontacts.cpp b/plugins/Variables/parse_metacontacts.cpp index 5940569bad..71a9da283b 100644 --- a/plugins/Variables/parse_metacontacts.cpp +++ b/plugins/Variables/parse_metacontacts.cpp @@ -69,11 +69,9 @@ static TCHAR *parseGetParent(ARGUMENTSINFO *ai) } TCHAR* tszProto; - #ifdef UNICODE + tszProto = a2u(szProto); - #else - tszProto = _strdup(szProto); - #endif + if ( tszProto != NULL && szUniqueID != NULL ) { wsprintf(res, _T("<%s:%s>"), tszProto, szUniqueID); @@ -130,11 +128,9 @@ static TCHAR *parseGetDefault(ARGUMENTSINFO *ai) } TCHAR* tszProto; - #ifdef UNICODE + tszProto = a2u(szProto); - #else - tszProto = _strdup(szProto); - #endif + if ( tszProto != NULL && szUniqueID != NULL ) { wsprintf(res, _T("<%s:%s>"), tszProto, szUniqueID); @@ -191,11 +187,9 @@ static TCHAR *parseGetMostOnline(ARGUMENTSINFO *ai) } TCHAR* tszProto; - #ifdef UNICODE + tszProto = a2u(szProto); - #else - tszProto = _strdup(szProto); - #endif + if ( tszProto != NULL && szUniqueID != NULL ) { wsprintf(res, _T("<%s:%s>"), tszProto, szUniqueID); -- cgit v1.2.3