1 files changed, 16 insertions, 21 deletions
diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h
index 6835ba182b..2a725d2920 100755
--- a/plugins/Msg_Export/src/utils.h
+++ b/plugins/Msg_Export/src/utils.h
@@ -20,9 +20,6 @@
 #ifndef MSG_EXP_UTILS_H
 #define MSG_EXP_UTILS_H
 
-#define tstring wstring
-#define _DBGetString _DBGetStringW
-
 enum ENDialogAction
 {
 	eDAPromptUser,
@@ -34,10 +31,10 @@ extern ENDialogAction enRenameAction;
 extern ENDialogAction enDeleteAction;
 
 extern int nMaxLineWidth;
-extern tstring sExportDir;
-extern tstring sDefaultFile;
-extern tstring sTimeFormat;
-extern map<tstring, string::size_type, less<tstring> > clFileTo1ColWidth;
+extern wstring sExportDir;
+extern wstring sDefaultFile;
+extern wstring sTimeFormat;
+extern map<wstring, string::size_type, less<wstring> > clFileTo1ColWidth;
 
 extern bool bAppendNewLine;
 extern bool bUseUtf8InNewFiles;
@@ -45,40 +42,38 @@ extern bool bUseLessAndGreaterInExport;
 
 extern bool bReplaceHistory;
 
-tstring sGetErrorString(DWORD dwError);
-tstring sGetErrorString();
+wstring sGetErrorString(DWORD dwError);
+wstring sGetErrorString();
 void DisplayLastError(const wchar_t *pszError);
-void DisplayErrorDialog(const wchar_t *pszError, tstring& sFilePath, DBEVENTINFO *dbei);
-
-wchar_t *CheckedTranslate(const wchar_t *szEng, int nFormatCount = -1);
+void DisplayErrorDialog(const wchar_t *pszError, wstring &sFilePath, DBEVENTINFO *dbei);
 
 void SaveSettings();
 void ShowDebugInfo();
 
 bool bIsExportEnabled(MCONTACT hContact);
-HANDLE openCreateFile(tstring sFilePath);
-bool bExportEvent(MCONTACT hContact, MEVENT hDbEvent, HANDLE hFile, tstring sFilePath, bool bAppendOnly);
+HANDLE openCreateFile(wstring sFilePath);
+bool bExportEvent(MCONTACT hContact, MEVENT hDbEvent, HANDLE hFile, wstring sFilePath, bool bAppendOnly);
 
 int nExportEvent(WPARAM wparam, LPARAM lparam);
 int nContactDeleted(WPARAM wparam, LPARAM lparam);
 
 wchar_t* GetMyOwnNick(MCONTACT hContact);
 
-tstring __inline _DBGetStringW(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *pszError);
+wstring __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 wchar_t *pszReplace, const tstring &sNew);
-void ReplaceAll(tstring &sSrc, const wchar_t *pszReplace, const wchar_t *pszNew);
+void ReplaceAll(wstring &sSrc, const wchar_t *pszReplace, const wstring &sNew);
+void ReplaceAll(wstring &sSrc, const wchar_t *pszReplace, const wchar_t *pszNew);
 
 void UpdateFileToColWidth();
 
 bool bReadMirandaDirAndPath();
-tstring GetFilePathFromUser(MCONTACT hContact);
+wstring GetFilePathFromUser(MCONTACT hContact);
 
-void ReplaceDefines(MCONTACT hContact, tstring & sTarget);
-void ReplaceTimeVariables(tstring &sRet);
+void ReplaceDefines(MCONTACT hContact, wstring & sTarget);
+void ReplaceTimeVariables(wstring &sRet);
 
-bool bCreatePathToFile(tstring sFilePath);
+bool bCreatePathToFile(wstring sFilePath);
 
 bool bWriteIndentedToFile(HANDLE hFile, int nIndent, const char *pszSrc, bool bUtf8File);
 bool bWriteIndentedToFile(HANDLE hFile, int nIndent, const wchar_t *pszSrc, bool bUtf8File);