diff options
author | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
---|---|---|
committer | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
commit | 224da21ea258450fcc78dd7635de84aba1d1df5e (patch) | |
tree | dc4df492779986aff60ed785f4821daae968d023 /src/properties.h | |
parent | d7a5438d3c7b140c0966243bae98ff447385d246 (diff) | |
parent | ed60c53eb2fe5ef377fc726df796d0aaf2005c6c (diff) | |
download | mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.gz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.bz2 mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.xz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.zip |
Merge branch 'master' of git://gitorious.org/tmw/eathena
Diffstat (limited to 'src/properties.h')
-rw-r--r-- | src/properties.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/properties.h b/src/properties.h index 2eafeeca..a593e8c2 100644 --- a/src/properties.h +++ b/src/properties.h @@ -35,8 +35,7 @@ class Properties /** * Destructor. */ - virtual - ~Properties() {} + virtual ~Properties() {} /** * Get a map property. @@ -46,8 +45,8 @@ class Properties * @return the value of the given property or the given default when it * doesn't exist. */ - const std::string& - getProperty(const std::string &name, const std::string &def = "") const + const std::string &getProperty(const std::string &name, + const std::string &def = "") const { PropertyMap::const_iterator i = mProperties.find(name); return (i != mProperties.end()) ? i->second : def; @@ -61,7 +60,7 @@ class Properties * @return the value of the given property, or 0.0f when it doesn't * exist. */ - float getFloatProperty(std::string const &name, float def = 0.0f) const + float getFloatProperty(const std::string &name, float def = 0.0f) const { PropertyMap::const_iterator i = mProperties.find(name); float ret = def; @@ -81,8 +80,7 @@ class Properties * @return <code>true</code> when a property is defined, * <code>false</code> otherwise. */ - bool - hasProperty(const std::string &name) const + bool hasProperty(const std::string &name) const { return (mProperties.find(name) != mProperties.end()); } @@ -93,8 +91,7 @@ class Properties * @param name The name of the property. * @param value The value of the property. */ - void - setProperty(const std::string &name, const std::string &value) + void setProperty(const std::string &name, const std::string &value) { mProperties[name] = value; } |