summaryrefslogtreecommitdiff
path: root/Application.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:00:17 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:00:17 +0200
commitfd0853d2623dd278b08288331ed42e3be59252fb (patch)
treea7645daeaef8bdbed064faf4eb88e72cee58726c /Application.h
parent2.1 (diff)
downloadFreeFileSync-fd0853d2623dd278b08288331ed42e3be59252fb.tar.gz
FreeFileSync-fd0853d2623dd278b08288331ed42e3be59252fb.tar.bz2
FreeFileSync-fd0853d2623dd278b08288331ed42e3be59252fb.zip
2.2
Diffstat (limited to 'Application.h')
-rw-r--r--Application.h7
1 files changed, 3 insertions, 4 deletions
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 <wx/app.h>
-#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
bgstack15