summaryrefslogtreecommitdiff
path: root/src/configuration.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-13 22:56:33 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-13 22:56:33 +0100
commit59f441730d8dbd7574b2fe4c9a430be256449cab (patch)
treefe01d073652e9c0615828afc0d99ac6ee35b75fd /src/configuration.cpp
parent7d5c6124e9c9cf447286eaa58afe17adf6c1a81d (diff)
downloadmana-59f441730d8dbd7574b2fe4c9a430be256449cab.tar.gz
mana-59f441730d8dbd7574b2fe4c9a430be256449cab.tar.bz2
mana-59f441730d8dbd7574b2fe4c9a430be256449cab.tar.xz
mana-59f441730d8dbd7574b2fe4c9a430be256449cab.zip
Code style reformatting
Got rid of "void" in functions that take no arguments and removed the newline after the return type of a method in many places.
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r--src/configuration.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index e2deae31..49914467 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -60,7 +60,8 @@ void Configuration::setValue(const std::string &key, std::string value)
}
}
-std::string ConfigurationObject::getValue(const std::string &key, std::string deflt)
+std::string ConfigurationObject::getValue(const std::string &key,
+ std::string deflt)
{
OptionIterator iter = mOptions.find(key);
return ((iter != mOptions.end()) ? iter->second : deflt);
@@ -72,8 +73,7 @@ float ConfigurationObject::getValue(const std::string &key, float deflt)
return (iter != mOptions.end()) ? atof(iter->second.c_str()) : deflt;
}
-void
-ConfigurationObject::deleteList(const std::string &name)
+void ConfigurationObject::deleteList(const std::string &name)
{
for (ConfigurationList::const_iterator
it = mContainerOptions[name].begin(); it != mContainerOptions[name].end(); it++)
@@ -82,8 +82,7 @@ ConfigurationObject::deleteList(const std::string &name)
mContainerOptions[name].clear();
}
-void
-ConfigurationObject::clear(void)
+void ConfigurationObject::clear()
{
for (std::map<std::string, ConfigurationList>::const_iterator
it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
@@ -92,13 +91,12 @@ ConfigurationObject::clear(void)
}
-ConfigurationObject::~ConfigurationObject(void)
+ConfigurationObject::~ConfigurationObject()
{
clear();
}
-void
-ConfigurationObject::initFromXML(xmlNodePtr parent_node)
+void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
{
clear();
@@ -163,8 +161,7 @@ void Configuration::init(const std::string &filename)
xmlFreeDoc(doc);
}
-void
-ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
+void ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
{
for (OptionIterator i = mOptions.begin(); i != mOptions.end(); i++)
{