summaryrefslogtreecommitdiff
path: root/src/utils/xml.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 21:16:23 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 19:45:29 +0100
commit0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f (patch)
tree24c19cd4af285fd8ede2d9d866668d005b5f6e26 /src/utils/xml.cpp
parent1a769276ce68285040bffd63bd1c01495ce411a7 (diff)
downloadmana-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.gz
mana-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.bz2
mana-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.tar.xz
mana-0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f.zip
Mostly whitespace and formatting changes
(merged from eAthena client)
Diffstat (limited to 'src/utils/xml.cpp')
-rw-r--r--src/utils/xml.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 47f1bd04..05df9f1d 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -26,7 +26,7 @@
namespace XML
{
Document::Document(const std::string &filename):
- mDoc(NULL)
+ mDoc(0)
{
int size;
ResourceManager *resman = ResourceManager::getInstance();
@@ -59,8 +59,7 @@ namespace XML
return mDoc ? xmlDocGetRootElement(mDoc) : 0;
}
- int
- getProperty(xmlNodePtr node, const char* name, int def)
+ int getProperty(xmlNodePtr node, const char* name, int def)
{
int &ret = def;
@@ -73,8 +72,7 @@ namespace XML
return ret;
}
- double
- getFloatProperty(xmlNodePtr node, const char* name, double def)
+ double getFloatProperty(xmlNodePtr node, const char* name, double def)
{
double &ret = def;
@@ -87,8 +85,8 @@ namespace XML
return ret;
}
- std::string
- getProperty(xmlNodePtr node, const char *name, const std::string &def)
+ std::string getProperty(xmlNodePtr node, const char *name,
+ const std::string &def)
{
xmlChar *prop = xmlGetProp(node, BAD_CAST name);
if (prop) {
@@ -108,4 +106,5 @@ namespace XML
return NULL;
}
-}
+
+} // namespace XML