From d5d023f683b23fe26ddea93738cb721d532804f0 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 14 Jun 2012 16:22:13 +0000
Subject: another portion of "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/miranda.cpp |  6 ------
 src/core/miranda.h   | 45 +++++++++------------------------------------
 2 files changed, 9 insertions(+), 42 deletions(-)

(limited to 'src/core')

diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp
index 2403b5aaf8..5bcf10285f 100644
--- a/src/core/miranda.cpp
+++ b/src/core/miranda.cpp
@@ -578,11 +578,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int )
 	MyMonitorFromPoint = (pfnMyMonitorFromPoint)GetProcAddress(hUser32, "MonitorFromPoint");
 	MyMonitorFromRect = (pfnMyMonitorFromRect)GetProcAddress(hUser32, "MonitorFromRect");
 	MyMonitorFromWindow = (pfnMyMonitorFromWindow)GetProcAddress(hUser32, "MonitorFromWindow");
-#ifdef _UNICODE
 	MyGetMonitorInfo = (pfnMyGetMonitorInfo)GetProcAddress(hUser32, "GetMonitorInfoW");
-#else
-	MyGetMonitorInfo = (pfnMyGetMonitorInfo)GetProcAddress(hUser32, "GetMonitorInfoA");
-#endif
 
 	hShFolder = GetModuleHandleA("shell32");
 	shGetSpecialFolderPathA = (pfnSHGetSpecialFolderPathA)GetProcAddress(hShFolder, "SHGetSpecialFolderPathA");
@@ -769,8 +765,6 @@ static INT_PTR GetMirandaVersionText(WPARAM wParam, LPARAM lParam)
 	mir_snprintf(( char* )lParam, wParam, "%S x64 Unicode", productVersion );
 #elif defined( _UNICODE )
 	mir_snprintf(( char* )lParam, wParam, "%S Unicode", productVersion );
-#else
-	lstrcpyn((char*)lParam, productVersion, wParam);
 #endif
 	mir_free(pVerInfo);
 	return 0;
diff --git a/src/core/miranda.h b/src/core/miranda.h
index f9d6340fb4..044b807fa7 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -44,11 +44,7 @@ typedef HRESULT (STDAPICALLTYPE *pfnSHGetSpecialFolderPathW)(HWND, LPWSTR, int,
 extern pfnSHGetSpecialFolderPathA shGetSpecialFolderPathA;
 extern pfnSHGetSpecialFolderPathW shGetSpecialFolderPathW;
 
-#ifdef _UNICODE
 #define shGetSpecialFolderPath shGetSpecialFolderPathW
-#else
-#define shGetSpecialFolderPath shGetSpecialFolderPathA
-#endif
 
 typedef HDESK (WINAPI* pfnOpenInputDesktop)(DWORD, BOOL, DWORD);
 extern pfnOpenInputDesktop openInputDesktop;
@@ -177,13 +173,8 @@ char* Utf8EncodeUcs2( const wchar_t* str );
 
 int   Ucs2toUtf8Len(const wchar_t *src);
 
-#if defined( _UNICODE )
-	#define Utf8DecodeT Utf8DecodeUcs2
-	#define Utf8EncodeT Utf8EncodeUcs2
-#else
-	#define Utf8DecodeT Utf8DecodeA
-	#define Utf8EncodeT Utf8Encode
-#endif
+#define Utf8DecodeT Utf8DecodeUcs2
+#define Utf8EncodeT Utf8EncodeUcs2
 
 /**** langpack.c ***********************************************************************/
 
@@ -215,18 +206,12 @@ __inline unsigned int hashstr(const wchar_t * key)
 int pathToAbsolute(const char *pSrc, char *pOut, char* base);
 void CreatePathToFile( char* wszFilePath );
 int CreateDirectoryTree(const char *szDir);
-#if defined( _UNICODE )
-	void CreatePathToFileW( WCHAR* wszFilePath );
-	int CreateDirectoryTreeW(const WCHAR *szDir);
-	int pathToAbsoluteW(const TCHAR *pSrc, TCHAR *pOut, TCHAR* base);
-	#define pathToAbsoluteT pathToAbsoluteW
-	#define CreatePathToFileT CreatePathToFileW
-	#define CreateDirectoryTreeT CreateDirectoryTreeW
-#else
-	#define pathToAbsoluteT pathToAbsolute
-	#define CreatePathToFileT CreatePathToFile
-	#define CreateDirectoryTreeT CreateDirectoryTree
-#endif
+void CreatePathToFileW( WCHAR* wszFilePath );
+int CreateDirectoryTreeW(const WCHAR *szDir);
+int pathToAbsoluteW(const TCHAR *pSrc, TCHAR *pOut, TCHAR* base);
+#define pathToAbsoluteT pathToAbsoluteW
+#define CreatePathToFileT CreatePathToFileW
+#define CreateDirectoryTreeT CreateDirectoryTreeW
 
 /**** skin2icons.c *********************************************************************/
 
@@ -309,9 +294,7 @@ __inline static INT_PTR CallProtoService( const char* szModule, const char* szSe
 
 /**** utils.c **************************************************************************/
 
-#if defined( _UNICODE )
-	char*  __fastcall rtrim(char* str);
-#endif
+char*  __fastcall rtrim(char* str);
 TCHAR* __fastcall rtrim(TCHAR* str);
 char*  __fastcall ltrim(char* str);
 char* __fastcall ltrimp(char* str);
@@ -353,19 +336,9 @@ public:
 	operator const LPARAM () const { return ( LPARAM )m_body; }
 };
 
-#ifdef _UNICODE
-
 #define StrConvT( x ) StrConvUT( x )
 #define StrConvTu( x ) x
 #define StrConvA( x ) StrConvAT( x )
 #define StrConvU( x ) x
 
-#else
-
-#define StrConvT( x ) x
-#define StrConvTu( x ) StrConvAT( x )
-#define StrConvA( x ) x
-#define StrConvU( x ) StrConvUT( x )
-
-#endif
 
-- 
cgit v1.2.3