From 234db3e6d7e9f285054f92233b9406efd684eaa3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 30 Jul 2012 06:04:31 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@1268 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/utils.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'plugins/Msg_Export/src/utils.h') diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h index f2ca584cde..1e254c7843 100755 --- a/plugins/Msg_Export/src/utils.h +++ b/plugins/Msg_Export/src/utils.h @@ -29,7 +29,6 @@ #endif // defined ( _MSC_VER ) #pragma warning (push, 3 ) -#pragma warning (disable:4996) #include "stdio.h" @@ -50,18 +49,14 @@ #include #include #include -#pragma warning (default:4996) + #pragma warning (pop) using namespace std; -#ifdef _UNICODE - #define tstring wstring - #define _DBGetString _DBGetStringW -#else - #define tstring string - #define _DBGetString _DBGetStringA -#endif + +#define tstring wstring +#define _DBGetString _DBGetStringW enum ENDialogAction { @@ -114,12 +109,10 @@ void ReplaceDefines( HANDLE hContact , tstring & sTarget ); void ReplaceTimeVariables( tstring &sRet ); bool bCreatePathToFile( tstring sFilePath ); -#ifdef _UNICODE + bool bWriteIndentedToFile( HANDLE hFile , int nIndent , const char * pszSrc , bool bUtf8File ); -#endif bool bWriteIndentedToFile( HANDLE hFile , int nIndent , const _TCHAR * pszSrc , bool bUtf8File ); bool bWriteNewLine( HANDLE hFile , DWORD dwIndent ); bool bIsUtf8Header( BYTE * pucByteOrder ); - -#endif \ No newline at end of file +#endif -- cgit v1.2.3