From fd0853d2623dd278b08288331ed42e3be59252fb Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:00:17 +0200 Subject: 2.2 --- Application.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Application.h') diff --git a/Application.h b/Application.h index cf6d6dd4..55d6e02d 100644 --- a/Application.h +++ b/Application.h @@ -9,7 +9,6 @@ #define FREEFILESYNCAPP_H #include -#include "library/localization.h" #include "library/processXml.h" @@ -23,12 +22,12 @@ public: void OnStartApplication(wxIdleEvent& event); private: - void runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globalSettings); + void runGuiMode(const wxString& cfgFileName, xmlAccess::XmlGlobalSettings& settings); + void runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globSettings); - FreeFileSync::CustomLocale programLanguage; + xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both int returnValue; - xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both }; #endif // FREEFILESYNCAPP_H -- cgit