diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
| commit | 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 (patch) | |
| tree | 1c085bbf2302be294866c4fc6e0d225f8abbc346 /library/process_xml.cpp | |
| parent | 3.14 (diff) | |
| download | FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.gz FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.bz2 FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.zip | |
3.15
Diffstat (limited to 'library/process_xml.cpp')
| -rw-r--r-- | library/process_xml.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/library/process_xml.cpp b/library/process_xml.cpp index 79d233fc..9f95f5a3 100644 --- a/library/process_xml.cpp +++ b/library/process_xml.cpp @@ -6,11 +6,11 @@ // #include "process_xml.h" #include "../shared/xml_base.h" -#include <wx/intl.h> -#include <wx/filefn.h> +#include "../shared/i18n.h" #include "../shared/global_func.h" #include "../shared/standard_paths.h" #include "../shared/string_conv.h" +#include "../shared/file_handling.h" using namespace ffs3; using namespace xmlAccess; //functionally needed!!! @@ -52,7 +52,7 @@ bool writeXmlMainConfig(const MainConfiguration& mainCfg, TiXmlDocument& doc); void xmlAccess::readConfig(const wxString& filename, xmlAccess::XmlGuiConfig& config) { //load XML - if (!wxFileExists(filename)) + if (!fileExists(wxToZ(filename))) throw XmlError(wxString(_("File does not exist:")) + wxT("\n\"") + filename + wxT("\"")); TiXmlDocument doc; @@ -70,7 +70,7 @@ void xmlAccess::readConfig(const wxString& filename, xmlAccess::XmlGuiConfig& co void xmlAccess::readConfig(const wxString& filename, xmlAccess::XmlBatchConfig& config) { //load XML - if (!wxFileExists(filename)) + if (!fileExists(wxToZ(filename))) throw XmlError(wxString(_("File does not exist:")) + wxT("\n\"") + filename + wxT("\"")); TiXmlDocument doc; @@ -88,7 +88,7 @@ void xmlAccess::readConfig(const wxString& filename, xmlAccess::XmlBatchConfig& void xmlAccess::readConfig(xmlAccess::XmlGlobalSettings& config) { //load XML - if (!wxFileExists(getGlobalConfigFile())) + if (!fileExists(wxToZ(getGlobalConfigFile()))) throw XmlError(wxString(_("File does not exist:")) + wxT("\n\"") + getGlobalConfigFile() + wxT("\"")); TiXmlDocument doc; @@ -981,12 +981,6 @@ bool writeXmlGlobalSettings(const xmlAccess::XmlGlobalSettings& inputCfg, TiXmlD } -int xmlAccess::retrieveSystemLanguage() -{ - return wxLocale::GetSystemLanguage(); -} - - wxString xmlAccess::getGlobalConfigFile() { return ffs3::getConfigDir() + wxT("GlobalSettings.xml"); |