From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 17:42:08 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Quotes/DBUtils.h | 5 +---- protocols/Quotes/QuotesProviderBase.cpp | Bin 59044 -> 58852 bytes protocols/Quotes/stdafx.h | 13 +------------ 3 files changed, 2 insertions(+), 16 deletions(-) (limited to 'protocols/Quotes') diff --git a/protocols/Quotes/DBUtils.h b/protocols/Quotes/DBUtils.h index d154e99075..27e3de5038 100644 --- a/protocols/Quotes/DBUtils.h +++ b/protocols/Quotes/DBUtils.h @@ -4,11 +4,8 @@ std::string Quotes_DBGetStringA(HANDLE hContact,const char* szModule,const char* szSetting,const char* pszDefValue = NULL); std::wstring Quotes_DBGetStringW(HANDLE hContact,const char* szModule,const char* szSetting,const wchar_t* pszDefValue = NULL); -#ifdef _UNICODE + #define Quotes_DBGetStringT Quotes_DBGetStringW -#else -#define Quotes_DBGetStringT Quotes_DBGetStringA -#endif bool Quotes_DBWriteDouble(HANDLE hContact,const char* szModule,const char* szSetting,double dValue); bool Quotes_DBReadDouble(HANDLE hContact,const char* szModule,const char* szSetting,double& rdValue); diff --git a/protocols/Quotes/QuotesProviderBase.cpp b/protocols/Quotes/QuotesProviderBase.cpp index c92c748a02..c60909d7fa 100644 Binary files a/protocols/Quotes/QuotesProviderBase.cpp and b/protocols/Quotes/QuotesProviderBase.cpp differ diff --git a/protocols/Quotes/stdafx.h b/protocols/Quotes/stdafx.h index 19c85a3303..23cd7c3c4a 100644 --- a/protocols/Quotes/stdafx.h +++ b/protocols/Quotes/stdafx.h @@ -74,7 +74,7 @@ #include #include -#ifdef _UNICODE + typedef std::wstring tstring; typedef std::wostringstream tostringstream; typedef std::wistringstream tistringstream; @@ -84,17 +84,6 @@ typedef std::wostream tostream; typedef std::wistream tistream; typedef boost::posix_time::wtime_input_facet ttime_input_facet; typedef boost::posix_time::wtime_facet ttime_facet; -#else -typedef std::string tstring; -typedef std::ostringstream tostringstream; -typedef std::istringstream tistringstream; -typedef std::ofstream tofstream; -typedef std::ifstream tifstream; -typedef std::ostream tostream; -typedef std::istream tistream; -typedef boost::posix_time::time_input_facet ttime_input_facet; -typedef boost::posix_time::time_facet ttime_facet; -#endif inline int quotes_stricmp(LPCTSTR p1,LPCTSTR p2) { -- cgit v1.2.3