9 files changed, 27 insertions, 34 deletions
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 96ce63d4..8dbc441f 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,5 +51,4 @@ inline void delete_all(Container &c)
     std::for_each(c.begin(), c.end(), make_dtor(c));
 }
 
-
 #endif
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index f7286187..5281d491 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 569b6808..5e5df8f8 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index f90e6258..07fb3508 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 1d33c3f7..78e7a04c 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 131d559d..28d8c521 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/trim.h b/src/utils/trim.h
index 0602842f..b7474ac7 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 562f69e3..d5dd54be 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,7 +28,7 @@
 namespace XML
 {
     Document::Document(const std::string &filename):
-        mDoc(NULL)
+        mDoc(0)
     {
         int size;
         ResourceManager *resman = ResourceManager::getInstance();
@@ -88,7 +87,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 +108,5 @@ namespace XML
 
         return NULL;
     }
-}
+
+} // namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index b7d67924..76a63ff4 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,10 +22,10 @@
 #ifndef XML_H
 #define XML_H
 
-#include <string>
-
 #include <libxml/tree.h>
 
+#include <string>
+
 /**
  * XML helper functions.
  */
@@ -82,7 +81,8 @@ namespace XML
     /**
      * 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