From 505322a5252f6ecffe3ee99ddc41df71db13fd06 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 14 Apr 2015 15:37:05 +0000 Subject: duplicated macro removed git-svn-id: http://svn.miranda-ng.org/main/trunk@12813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/miranda.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'src/core') diff --git a/src/core/miranda.h b/src/core/miranda.h index 5f0d7e2ddc..2609052789 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.h @@ -172,39 +172,21 @@ int AssertInsideScreen(RECT &rc); HBITMAP ConvertIconToBitmap(HICON hIcon, HIMAGELIST hIml, int iconId); -class StrConvUT -{ -private: - wchar_t* m_body; - -public: - StrConvUT(const char* pSrc) : - m_body(mir_a2u(pSrc)) {} - - ~StrConvUT() { mir_free(m_body); } - operator const wchar_t* () const { return m_body; } -}; - -class StrConvAT +class StrConvA { private: char* m_body; public: - StrConvAT(const wchar_t* pSrc) : + StrConvA(const wchar_t* pSrc) : m_body(mir_u2a(pSrc)) {} - ~StrConvAT() { mir_free(m_body); } + ~StrConvA() { mir_free(m_body); } operator const char* () const { return m_body; } operator const wchar_t* () const { return (wchar_t*)m_body; } // type cast to fake the interface definition operator const LPARAM () const { return (LPARAM)m_body; } }; -#define StrConvT(x) StrConvUT(x) -#define StrConvTu(x) x -#define StrConvA(x) StrConvAT(x) -#define StrConvU(x) x - /////////////////////////////////////////////////////////////////////////////// extern "C" -- cgit v1.2.3