MsgExport: options diivded into two separate dialogs, code cleaning

1 files changed, 10 insertions, 12 deletions

diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h
index 2a725d2920..25b9fac08a 100755
--- a/plugins/Msg_Export/src/utils.h
+++ b/plugins/Msg_Export/src/utils.h
@@ -27,29 +27,27 @@ enum ENDialogAction
 	eDANothing

 };

 

-extern ENDialogAction enRenameAction;

-extern ENDialogAction enDeleteAction;

+extern ENDialogAction g_enRenameAction;

+extern ENDialogAction g_enDeleteAction;

 

 extern int nMaxLineWidth;

-extern wstring sExportDir;

-extern wstring sDefaultFile;

-extern wstring sTimeFormat;

+extern wstring g_sExportDir;

+extern wstring g_sDefaultFile;

+extern wstring g_sTimeFormat;

 extern map<wstring, string::size_type, less<wstring> > clFileTo1ColWidth;

 

-extern bool bAppendNewLine;

-extern bool bUseUtf8InNewFiles;

-extern bool bUseLessAndGreaterInExport;

+extern bool g_bAppendNewLine;

+extern bool g_bUseJson;

+extern bool g_bUseUtf8InNewFiles;

+extern bool g_bUseLessAndGreaterInExport;

 

-extern bool bReplaceHistory;

+extern bool g_bReplaceHistory;

 

 wstring sGetErrorString(DWORD dwError);

 wstring sGetErrorString();

 void DisplayLastError(const wchar_t *pszError);

 void DisplayErrorDialog(const wchar_t *pszError, wstring &sFilePath, DBEVENTINFO *dbei);

 

-void SaveSettings();

-void ShowDebugInfo();

-

 bool bIsExportEnabled(MCONTACT hContact);

 HANDLE openCreateFile(wstring sFilePath);

 bool bExportEvent(MCONTACT hContact, MEVENT hDbEvent, HANDLE hFile, wstring sFilePath, bool bAppendOnly);