From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/general.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/SmileyAdd/src/general.cpp') diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index 4fda95dd92..3071b83494 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -59,7 +59,7 @@ HICON GetDefaultIcon(bool copy) return resIco; } -const wchar_t* GetImageExt(CMString &fname) +const wchar_t* GetImageExt(CMStringW &fname) { const wchar_t *ext = L""; @@ -124,14 +124,14 @@ HICON ImageList_GetIconFixed(HIMAGELIST himl, INT i, UINT fStyle) return hIcon; } -void pathToRelative(const CMString &pSrc, CMString &pOut) +void pathToRelative(const CMStringW &pSrc, CMStringW &pOut) { wchar_t szOutPath[MAX_PATH]; PathToRelativeT(pSrc.c_str(), szOutPath); pOut = szOutPath; } -void pathToAbsolute(const CMString &pSrc, CMString &pOut) +void pathToAbsolute(const CMStringW &pSrc, CMStringW &pOut) { wchar_t szOutPath[MAX_PATH]; @@ -139,10 +139,10 @@ void pathToAbsolute(const CMString &pSrc, CMString &pOut) if (szVarPath == (wchar_t*)CALLSERVICE_NOTFOUND || szVarPath == NULL) { wchar_t szExpPath[MAX_PATH]; ExpandEnvironmentStrings(pSrc.c_str(), szExpPath, _countof(szExpPath)); - PathToAbsoluteT(szExpPath, szOutPath); + PathToAbsoluteW(szExpPath, szOutPath); } else { - PathToAbsoluteT(szVarPath, szOutPath); + PathToAbsoluteW(szVarPath, szOutPath); mir_free(szVarPath); } pOut = szOutPath; -- cgit v1.2.3