Pedantic fixes to the client, where I alphabetized all of the include

statements, as well as removing the new skill dialog, which we do not, 
nor will we use (if we do, it'd be a new one that we'd make).

WARNING!!! This, and all other previous builds have a linker error for 
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is 
also the case for other users of this library as well. I'm currently 
assuming that there's a bug in the compiler itself, and will look into 
reporting this, but in the mean time, it doesn't build for these users, 
unfortunately. Sorry about this.

10 files changed, 5 insertions, 21 deletions

diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index e98216d4..9d8ba836 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -26,10 +26,9 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id: base64.cpp 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "base64.h"
 
diff --git a/src/utils/base64.h b/src/utils/base64.h
index 3356debf..c802207b 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: base64.h 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 29cde178..514ea9e7 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: dtor.h 2271 2006-03-18 15:15:33Z der_doener $
  */
 
 #ifndef _TMW_UTILS_DTOR_H
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index 4513a79d..8da1d354 100644
--- a/src/utils/fastsqrt.h
+++ b/src/utils/fastsqrt.h
@@ -5,8 +5,6 @@
  * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf

  *

  * Unfortunately the original creator of this function seems to be unknown.

- *

- * $Id: fastsqrt.h 3508 2007-08-22 16:32:52Z b_lindeijer $

  */

 

 float fastInvSqrt(float x)

diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 48fc3814..c532dd0d 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $
  */
 
 #include <cstdarg>
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 66d753fa..382ab6e0 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: strprintf.h 3417 2007-08-06 11:14:45Z gmelquio $
  */
 
 #ifndef _TMW_UTILS_STRPRINTF_H
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 3cbeef27..d2dd941a 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tostring.h 3500 2007-08-21 15:11:19Z joshlangley $
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/trim.h b/src/utils/trim.h
index 7b236730..a7c40ca2 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: trim.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_UTILS_TRIM_H_
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index c0b921b8..e511ced3 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -17,12 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: xml.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "xml.h"
+
 #include "../log.h"
+
 #include "../resources/resourcemanager.h"
 
 namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index c64c1204..9e691963 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: xml.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_XML_H
 #define _TMW_XML_H
 
-#include <libxml/tree.h>
-
 #include <string>
 
+#include <libxml/tree.h>
+
 /**
  * XML helper functions.
  */