Style cleanups throughout most of the code. Splitting function type from

the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>

2 files changed, 6 insertions, 12 deletions

diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index e511ced3..db78d08c 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -61,8 +61,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;
 
@@ -75,8 +74,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;
 
@@ -89,8 +87,7 @@ 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) {
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 9e691963..403fe6d9 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -71,20 +71,17 @@ namespace XML
     /**
      * Gets an integer property from an xmlNodePtr.
      */
-    int
-    getProperty(xmlNodePtr node, const char *name, int def);
+    int getProperty(xmlNodePtr node, const char *name, int def);
 
     /**
      * Gets an floating point property from an xmlNodePtr.
      */
-    double
-    getFloatProperty(xmlNodePtr node, const char *name, double def);
+    double getFloatProperty(xmlNodePtr node, const char *name, double def);
 
     /**
      * Gets a string property from an xmlNodePtr.
      */
-    std::string
-    getProperty(xmlNodePtr node, const char *name, const std::string &def);
+    std::string getProperty(xmlNodePtr node, const char *name, const std::string &def);
 
     /**
      * Finds the first child node with the given name