From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/utils.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 ac567f8808..f7bf70efc8 100755 --- a/plugins/Msg_Export/src/utils.h +++ b/plugins/Msg_Export/src/utils.h @@ -47,9 +47,9 @@ extern bool bReplaceHistory; tstring sGetErrorString(DWORD dwError); tstring sGetErrorString(); -void DisplayLastError(const TCHAR *pszError); +void DisplayLastError(const wchar_t *pszError); -TCHAR *CheckedTranslate(const TCHAR *szEng, int nFormatCount = -1); +wchar_t *CheckedTranslate(const wchar_t *szEng, int nFormatCount = -1); void SaveSettings(); void ShowDebugInfo(); @@ -57,13 +57,13 @@ void ShowDebugInfo(); int nExportEvent(WPARAM wparam, LPARAM lparam); int nContactDeleted(WPARAM wparam, LPARAM lparam); -TCHAR* GetMyOwnNick(MCONTACT hContact); +wchar_t* GetMyOwnNick(MCONTACT hContact); -tstring __inline _DBGetStringW(MCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *pszError); +tstring __inline _DBGetStringW(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *pszError); string __inline _DBGetStringA(MCONTACT hContact, const char *szModule, const char *szSetting, const char *pszError); -void ReplaceAll(tstring &sSrc, const TCHAR *pszReplace, const tstring &sNew); -void ReplaceAll(tstring &sSrc, const TCHAR *pszReplace, const TCHAR *pszNew); +void ReplaceAll(tstring &sSrc, const wchar_t *pszReplace, const tstring &sNew); +void ReplaceAll(tstring &sSrc, const wchar_t *pszReplace, const wchar_t *pszNew); void UpdateFileToColWidth(); @@ -76,7 +76,7 @@ void ReplaceTimeVariables(tstring &sRet); bool bCreatePathToFile(tstring sFilePath); bool bWriteIndentedToFile(HANDLE hFile, int nIndent, const char *pszSrc, bool bUtf8File); -bool bWriteIndentedToFile(HANDLE hFile, int nIndent, const TCHAR *pszSrc, bool bUtf8File); +bool bWriteIndentedToFile(HANDLE hFile, int nIndent, const wchar_t *pszSrc, bool bUtf8File); bool bWriteNewLine(HANDLE hFile, DWORD dwIndent); bool bIsUtf8Header(BYTE * pucByteOrder); -- cgit v1.2.3