summaryrefslogtreecommitdiff
path: root/RealtimeSync/xml_ffs.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:12:17 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:12:17 +0200
commitb654dbfa5f3e4a4d02f72023f7c5895635aa6396 (patch)
tree8c1dfe7f638c0fc7afc1d08bc2fc0fd0f8646e5e /RealtimeSync/xml_ffs.cpp
parent3.17 (diff)
downloadFreeFileSync-b654dbfa5f3e4a4d02f72023f7c5895635aa6396.tar.gz
FreeFileSync-b654dbfa5f3e4a4d02f72023f7c5895635aa6396.tar.bz2
FreeFileSync-b654dbfa5f3e4a4d02f72023f7c5895635aa6396.zip
3.18
Diffstat (limited to 'RealtimeSync/xml_ffs.cpp')
-rw-r--r--RealtimeSync/xml_ffs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/RealtimeSync/xml_ffs.cpp b/RealtimeSync/xml_ffs.cpp
index 03d266df..15e6f4c2 100644
--- a/RealtimeSync/xml_ffs.cpp
+++ b/RealtimeSync/xml_ffs.cpp
@@ -62,7 +62,7 @@ xmlAccess::XmlRealConfig convertBatchToReal(const xmlAccess::XmlBatchConfig& bat
}
-void rts::readRealOrBatchConfig(const wxString& filename, xmlAccess::XmlRealConfig& config) //throw (xmlAccess::XmlError);
+void rts::readRealOrBatchConfig(const wxString& filename, xmlAccess::XmlRealConfig& config) //throw (xmlAccess::FfsXmlError);
{
if (xmlAccess::getXmlType(filename) != xmlAccess::XML_TYPE_BATCH)
{
@@ -74,11 +74,11 @@ void rts::readRealOrBatchConfig(const wxString& filename, xmlAccess::XmlRealConf
xmlAccess::XmlBatchConfig batchCfg;
try
{
- xmlAccess::readConfig(filename, batchCfg); //throw (xmlAccess::XmlError);
+ xmlAccess::readConfig(filename, batchCfg); //throw (xmlAccess::FfsXmlError);
}
- catch (const xmlAccess::XmlError& e)
+ catch (const xmlAccess::FfsXmlError& e)
{
- if (e.getSeverity() == xmlAccess::XmlError::WARNING)
+ if (e.getSeverity() == xmlAccess::FfsXmlError::WARNING)
config = convertBatchToReal(batchCfg, filename); //do work despite parsing errors, then re-throw
throw; //
@@ -95,7 +95,7 @@ int rts::getProgramLanguage()
{
xmlAccess::readConfig(settings);
}
- catch (const xmlAccess::XmlError&) {} //user default language if error occured
+ catch (const xmlAccess::FfsXmlError&) {} //user default language if error occured
return settings.programLanguage;
}
bgstack15