From fb68c6f2f9fce05b6cb0e8f941790b891f86193e Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Thu, 24 Sep 2015 20:11:03 +0200 Subject: Split CRSMConfig into CRSMConfigBase (for reuse) and CRSMConfig --- src/CRSMConfig.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'src/CRSMConfig.cpp') diff --git a/src/CRSMConfig.cpp b/src/CRSMConfig.cpp index 8fe5995..747aaa2 100644 --- a/src/CRSMConfig.cpp +++ b/src/CRSMConfig.cpp @@ -2,23 +2,18 @@ #include -CRSMConfig::CRSMConfig() -{ - -} - -void CRSMConfig::addConfigValue(QString name, CRSMConfigValueBase* value) +void CRSMConfigBase::addConfigValue(QString name, CRSMConfigValueBase* value) { configValues[name] = value; } -void CRSMConfig::setConfigValue(const QString &name, const QString &value) +void CRSMConfigBase::setConfigValue(const QString &name, const QString &value) { CRSMConfigValueBase& configValue = getConfigValue(name); configValue.setValue(value); } -void CRSMConfig::addConfigListEntry(const QString &name, const QString &value) +void CRSMConfigBase::addConfigListEntry(const QString &name, const QString &value) { CRSMConfigValueBase& configValue = getConfigValue(name); if(configValue.type() != CRSMConfigValueType::List) @@ -28,7 +23,7 @@ void CRSMConfig::addConfigListEntry(const QString &name, const QString &value) ((CRSMConfigValueList*)&configValue)->append(value); } -void CRSMConfig::setConfigMapValue(const QString &name, const QString &key, const QString &value) +void CRSMConfigBase::setConfigMapValue(const QString &name, const QString &key, const QString &value) { CRSMConfigValueBase& configValue = getConfigValue(name); if(configValue.type() != CRSMConfigValueType::Map) @@ -38,7 +33,7 @@ void CRSMConfig::setConfigMapValue(const QString &name, const QString &key, cons ((CRSMConfigValueMap*)&configValue)->setKeyValue(key, value); } -CRSMConfigValueBase& CRSMConfig::getConfigValue(const QString& name) +CRSMConfigValueBase& CRSMConfigBase::getConfigValue(const QString& name) { if(!configValues.contains(name)) { @@ -50,7 +45,7 @@ CRSMConfigValueBase& CRSMConfig::getConfigValue(const QString& name) } } -QString CRSMConfig::read(const QString &fileName) +QString CRSMConfigBase::read(const QString &fileName) { QString ret = ""; @@ -104,7 +99,7 @@ QString CRSMConfig::read(const QString &fileName) return ret; } -bool CRSMConfig::write(const QString &fileName) +bool CRSMConfigBase::write(const QString &fileName) { QFile config(fileName); if(config.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) @@ -144,7 +139,7 @@ bool CRSMConfig::write(const QString &fileName) void CRSMConfig::clear() { - auto curConfigValues(configValues); - (*this) = CRSMConfig(); - configValues = curConfigValues; + auto configVals = configValues; + *this = CRSMConfig(); + configValues = configVals; } -- cgit v1.2.3-54-g00ecf