summaryrefslogtreecommitdiff
path: root/src/configuration.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
commite826d4c63365dde4c988453846437dcb65370945 (patch)
tree1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/configuration.cpp
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadmv-e826d4c63365dde4c988453846437dcb65370945.tar.gz
mv-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
mv-e826d4c63365dde4c988453846437dcb65370945.tar.xz
mv-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r--src/configuration.cpp368
1 files changed, 170 insertions, 198 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 6e42304f6..bce7d79b4 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -363,7 +363,7 @@ Configuration::Configuration() :
ConfigurationObject(),
mListenerMap(),
mConfigPath(),
- mDefaultsData(nullptr),
+ mDefaultsData(),
mDirectory(),
mFilename(),
mUseResManager(UseVirtFs_false),
@@ -377,17 +377,13 @@ Configuration::Configuration() :
void Configuration::cleanDefaults()
{
- if (mDefaultsData != nullptr)
+ for (DefaultsData::const_iterator iter = mDefaultsData.begin();
+ iter != mDefaultsData.end();
+ ++iter)
{
- for (DefaultsData::const_iterator iter = mDefaultsData->begin();
- iter != mDefaultsData->end();
- ++iter)
- {
- delete (iter->second);
- }
- mDefaultsData->clear();
- delete2(mDefaultsData);
+ delete iter->second;
}
+ mDefaultsData.clear();
}
Configuration::~Configuration()
@@ -405,12 +401,6 @@ void Configuration::unload()
ConfigurationObject::clear();
}
-void Configuration::setDefaultValues(DefaultsData *const defaultsData)
-{
- cleanDefaults();
- mDefaultsData = defaultsData;
-}
-
int Configuration::getIntValue(const std::string &key) const
{
GETLOG();
@@ -418,47 +408,44 @@ int Configuration::getIntValue(const std::string &key) const
const Options::const_iterator iter = mOptions.find(key);
if (iter == mOptions.end())
{
- if (mDefaultsData != nullptr)
- {
- const DefaultsData::const_iterator itdef
- = mDefaultsData->find(key);
+ const DefaultsData::const_iterator itdef
+ = mDefaultsData.find(key);
- if (itdef != mDefaultsData->end() && (itdef->second != nullptr))
+ if (itdef != mDefaultsData.end() && (itdef->second != nullptr))
+ {
+ const VariableData *const data = itdef->second;
+ const VariableData::DataType type = static_cast<
+ VariableData::DataType>(data->getType());
+ if (type == VariableData::DATA_INT)
{
- const VariableData *const data = itdef->second;
- const VariableData::DataType type = static_cast<
- VariableData::DataType>(data->getType());
- if (type == VariableData::DATA_INT)
- {
- defaultValue = (static_cast<const IntData*>(
- data))->getData();
- }
- else if (type == VariableData::DATA_STRING)
- {
- defaultValue = atoi((static_cast<const StringData*>(
- data))->getData().c_str());
- }
- else if (type == VariableData::DATA_BOOL)
- {
- if ((static_cast<const BoolData*>(data))->getData())
- defaultValue = 1;
- else
- defaultValue = 0;
- }
- else if (type == VariableData::DATA_FLOAT)
- {
- defaultValue = CAST_S32(
- (static_cast<const FloatData*>(data))->getData());
- }
+ defaultValue = (static_cast<const IntData*>(
+ data))->getData();
+ }
+ else if (type == VariableData::DATA_STRING)
+ {
+ defaultValue = atoi((static_cast<const StringData*>(
+ data))->getData().c_str());
+ }
+ else if (type == VariableData::DATA_BOOL)
+ {
+ if ((static_cast<const BoolData*>(data))->getData())
+ defaultValue = 1;
+ else
+ defaultValue = 0;
}
- else
+ else if (type == VariableData::DATA_FLOAT)
{
- logger->assertLog(
- "%s: No integer value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
+ defaultValue = CAST_S32(
+ (static_cast<const FloatData*>(data))->getData());
}
}
+ else
+ {
+ logger->assertLog(
+ "%s: No integer value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
+ }
}
else
{
@@ -471,22 +458,19 @@ int Configuration::resetIntValue(const std::string &key)
{
GETLOG();
int defaultValue = 0;
- if (mDefaultsData != nullptr)
+ const DefaultsData::const_iterator itdef = mDefaultsData.find(key);
+ const VariableData *const data = itdef->second;
+ if (itdef != mDefaultsData.end() && data != nullptr
+ && data->getType() == VariableData::DATA_INT)
{
- const DefaultsData::const_iterator itdef = mDefaultsData->find(key);
- const VariableData *const data = itdef->second;
- if (itdef != mDefaultsData->end() && (data != nullptr)
- && data->getType() == VariableData::DATA_INT)
- {
- defaultValue = (static_cast<const IntData*>(
- data))->getData();
- }
- else
- {
- logger->assertLog("%s: No integer value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
- }
+ defaultValue = (static_cast<const IntData*>(
+ data))->getData();
+ }
+ else
+ {
+ logger->assertLog("%s: No integer value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
}
setValue(key, defaultValue);
return defaultValue;
@@ -499,46 +483,43 @@ std::string Configuration::getStringValue(const std::string &key) const
const Options::const_iterator iter = mOptions.find(key);
if (iter == mOptions.end())
{
- if (mDefaultsData != nullptr)
- {
- const DefaultsData::const_iterator
- itdef = mDefaultsData->find(key);
+ const DefaultsData::const_iterator
+ itdef = mDefaultsData.find(key);
- if (itdef != mDefaultsData->end() &&
- (itdef->second != nullptr))
+ if (itdef != mDefaultsData.end() &&
+ (itdef->second != nullptr))
+ {
+ const VariableData *const data = itdef->second;
+ const VariableData::DataType type = static_cast<
+ VariableData::DataType>(data->getType());
+ if (type == VariableData::DATA_STRING)
{
- const VariableData *const data = itdef->second;
- const VariableData::DataType type = static_cast<
- VariableData::DataType>(data->getType());
- if (type == VariableData::DATA_STRING)
- {
- defaultValue = (static_cast<const StringData*>(
- data))->getData();
- }
- else if (type == VariableData::DATA_BOOL)
- {
- if ((static_cast<const BoolData*>(data))->getData())
- defaultValue = "1";
- else
- defaultValue = "0";
- }
- else if (type == VariableData::DATA_INT)
- {
- defaultValue = toString((static_cast<const IntData*>(
- data))->getData());
- }
- else if (type == VariableData::DATA_FLOAT)
- {
- defaultValue = toString((static_cast<const FloatData*>(
- data))->getData());
- }
+ defaultValue = (static_cast<const StringData*>(
+ data))->getData();
+ }
+ else if (type == VariableData::DATA_BOOL)
+ {
+ if ((static_cast<const BoolData*>(data))->getData())
+ defaultValue = "1";
+ else
+ defaultValue = "0";
}
- else
+ else if (type == VariableData::DATA_INT)
{
- logger->assertLog("%s: No string value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
+ defaultValue = toString((static_cast<const IntData*>(
+ data))->getData());
}
+ else if (type == VariableData::DATA_FLOAT)
+ {
+ defaultValue = toString((static_cast<const FloatData*>(
+ data))->getData());
+ }
+ }
+ else
+ {
+ logger->assertLog("%s: No string value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
}
}
else
@@ -556,48 +537,45 @@ float Configuration::getFloatValue(const std::string &key) const
const Options::const_iterator iter = mOptions.find(key);
if (iter == mOptions.end())
{
- if (mDefaultsData != nullptr)
- {
- const DefaultsData::const_iterator itdef
- = mDefaultsData->find(key);
+ const DefaultsData::const_iterator itdef
+ = mDefaultsData.find(key);
- if (itdef != mDefaultsData->end() &&
- (itdef->second != nullptr))
+ if (itdef != mDefaultsData.end() &&
+ (itdef->second != nullptr))
+ {
+ const VariableData *const data = itdef->second;
+ const VariableData::DataType type = static_cast<
+ VariableData::DataType>(data->getType());
+ if (type == VariableData::DATA_FLOAT)
{
- const VariableData *const data = itdef->second;
- const VariableData::DataType type = static_cast<
- VariableData::DataType>(data->getType());
- if (type == VariableData::DATA_FLOAT)
- {
- defaultValue = static_cast<float>(
- (static_cast<const FloatData*>(data))->getData());
- }
- else if (type == VariableData::DATA_STRING)
- {
- defaultValue = static_cast<float>(atof((
- static_cast<const StringData*>(
- data))->getData().c_str()));
- }
- else if (type == VariableData::DATA_BOOL)
- {
- if ((static_cast<const BoolData*>(data))->getData())
- defaultValue = 1;
- else
- defaultValue = 0;
- }
- else if (type == VariableData::DATA_INT)
- {
- defaultValue = static_cast<float>((
- static_cast<const IntData*>(
- data))->getData());
- }
+ defaultValue = static_cast<float>(
+ (static_cast<const FloatData*>(data))->getData());
+ }
+ else if (type == VariableData::DATA_STRING)
+ {
+ defaultValue = static_cast<float>(atof((
+ static_cast<const StringData*>(
+ data))->getData().c_str()));
}
- else
+ else if (type == VariableData::DATA_BOOL)
{
- logger->assertLog("%s: No float value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
+ if ((static_cast<const BoolData*>(data))->getData())
+ defaultValue = 1;
+ else
+ defaultValue = 0;
}
+ else if (type == VariableData::DATA_INT)
+ {
+ defaultValue = static_cast<float>((
+ static_cast<const IntData*>(
+ data))->getData());
+ }
+ }
+ else
+ {
+ logger->assertLog("%s: No float value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
}
}
else
@@ -614,61 +592,58 @@ bool Configuration::getBoolValue(const std::string &key) const
const Options::const_iterator iter = mOptions.find(key);
if (iter == mOptions.end())
{
- if (mDefaultsData != nullptr)
- {
- const DefaultsData::const_iterator itdef
- = mDefaultsData->find(key);
+ const DefaultsData::const_iterator itdef
+ = mDefaultsData.find(key);
- if (itdef != mDefaultsData->end() &&
- (itdef->second != nullptr))
+ if (itdef != mDefaultsData.end() &&
+ (itdef->second != nullptr))
+ {
+ const VariableData *const data = itdef->second;
+ const VariableData::DataType type = static_cast<
+ VariableData::DataType>(data->getType());
+ if (type == VariableData::DATA_BOOL)
{
- const VariableData *const data = itdef->second;
- const VariableData::DataType type = static_cast<
- VariableData::DataType>(data->getType());
- if (type == VariableData::DATA_BOOL)
+ defaultValue = (static_cast<const BoolData*>(
+ data))->getData();
+ }
+ else if (type == VariableData::DATA_INT)
+ {
+ if ((static_cast<const IntData*>(data))->getData() != 0)
+ defaultValue = true;
+ else
+ defaultValue = false;
+ }
+ else if (type == VariableData::DATA_STRING)
+ {
+ if ((static_cast<const StringData*>(
+ data))->getData() != "0")
{
- defaultValue = (static_cast<const BoolData*>(
- data))->getData();
+ defaultValue = true;
}
- else if (type == VariableData::DATA_INT)
+ else
{
- if ((static_cast<const IntData*>(data))->getData() != 0)
- defaultValue = true;
- else
- defaultValue = false;
+ defaultValue = false;
}
- else if (type == VariableData::DATA_STRING)
+ }
+ if (type == VariableData::DATA_FLOAT)
+ {
+ if (CAST_S32((static_cast<const FloatData*>(
+ data))->getData()) != 0)
{
- if ((static_cast<const StringData*>(
- data))->getData() != "0")
- {
- defaultValue = true;
- }
- else
- {
- defaultValue = false;
- }
+ defaultValue = true;
}
- if (type == VariableData::DATA_FLOAT)
+ else
{
- if (CAST_S32((static_cast<const FloatData*>(
- data))->getData()) != 0)
- {
- defaultValue = true;
- }
- else
- {
- defaultValue = false;
- }
+ defaultValue = false;
}
}
- else
- {
- logger->assertLog(
- "%s: No boolean value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
- }
+ }
+ else
+ {
+ logger->assertLog(
+ "%s: No boolean value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
}
}
else
@@ -683,23 +658,20 @@ bool Configuration::resetBoolValue(const std::string &key)
{
GETLOG();
bool defaultValue = false;
- if (mDefaultsData != nullptr)
- {
- const DefaultsData::const_iterator itdef = mDefaultsData->find(key);
- const VariableData *const data = itdef->second;
+ const DefaultsData::const_iterator itdef = mDefaultsData.find(key);
+ const VariableData *const data = itdef->second;
- if (itdef != mDefaultsData->end() &&
- (data != nullptr) &&
- data->getType() == VariableData::DATA_BOOL)
- {
- defaultValue = (static_cast<const BoolData*>(data))->getData();
- }
- else
- {
- logger->assertLog("%s: No boolean value in registry for key %s",
- mConfigPath.c_str(),
- key.c_str());
- }
+ if (itdef != mDefaultsData.end() &&
+ (data != nullptr) &&
+ data->getType() == VariableData::DATA_BOOL)
+ {
+ defaultValue = (static_cast<const BoolData*>(data))->getData();
+ }
+ else
+ {
+ logger->assertLog("%s: No boolean value in registry for key %s",
+ mConfigPath.c_str(),
+ key.c_str());
}
setValue(key, defaultValue);