From 775404c84c3250225d43f10c4a5363e997618cb2 Mon Sep 17 00:00:00 2001
From: Rogier Polak <rogier.l.a.polak@gmail.com>
Date: Fri, 23 Feb 2007 19:18:28 +0000
Subject: Added unregistering, logout_then_exit, switch_character and
 switch_accountserver.

---
 src/gui/quitdialog.cpp | 129 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 src/gui/quitdialog.cpp

(limited to 'src/gui/quitdialog.cpp')

diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
new file mode 100644
index 00000000..97be5f46
--- /dev/null
+++ b/src/gui/quitdialog.cpp
@@ -0,0 +1,129 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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
+ *
+ */
+
+#include "quitdialog.h"
+#include <iostream>
+#include <string>
+
+#include <guichan/widgets/label.hpp>
+
+#include "../main.h"
+
+#include "button.h"
+#include "radiobutton.h"
+
+QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
+    Window("Quit", true, NULL), mQuitGame(quitGame), mMyPointer(pointerToMe)
+{
+
+    mLogoutQuit = new RadioButton("Quit", "quitdialog");
+    mForceQuit = new RadioButton("Quit", "quitdialog");
+    mSwitchAccountServer = new RadioButton("Switch server", "quitdialog");
+    mSwitchCharacter = new RadioButton("Switch character", "quitdialog");
+    mOkButton = new Button("OK", "ok", this);
+    mCancelButton = new Button("Cancel", "cancel", this);
+
+    setContentSize(200, 91);
+
+    mLogoutQuit->setPosition(5, 5);
+    mForceQuit->setPosition(5, 5);
+    mSwitchAccountServer->setPosition(5, 14 + mLogoutQuit->getHeight());
+    mSwitchCharacter->setPosition(5,
+           23 + mLogoutQuit->getHeight() + mSwitchAccountServer->getHeight());
+    mCancelButton->setPosition(
+           200 - mCancelButton->getWidth() - 5,
+           91 - mCancelButton->getHeight() - 5);
+    mOkButton->setPosition(
+           mCancelButton->getX() - mOkButton->getWidth() - 5,
+           91 - mOkButton->getHeight() - 5);
+
+    //All states, when we're not logged in to someone.
+    if (state == STATE_CHOOSE_SERVER ||
+        state == STATE_CONNECT_ACCOUNT ||
+        state == STATE_LOGIN ||
+        state == STATE_LOGIN_ATTEMPT ||
+        state == STATE_UPDATE)
+    {
+        mForceQuit->setMarked(true);
+        add(mForceQuit);
+    }
+    else
+    {
+        // Only added if we are connected to an accountserver or gameserver
+        mLogoutQuit->setMarked(true);
+        add(mLogoutQuit);
+        add(mSwitchAccountServer);
+
+        // Only added if we are connected to a gameserver
+        if (state == STATE_GAME) add(mSwitchCharacter);
+    }
+
+    add(mOkButton);
+    add(mCancelButton);
+
+    setLocationRelativeTo(getParent());
+    setVisible(true);
+
+    mOkButton->requestFocus();
+
+}
+
+QuitDialog::~QuitDialog()
+{
+    if (mMyPointer) *mMyPointer = NULL;
+}
+
+void
+QuitDialog::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "ok")
+    {
+        if (mForceQuit->isMarked())
+        {
+            state = STATE_FORCE_QUIT;
+        }
+        else if (mLogoutQuit->isMarked())
+        {
+            if ((state == STATE_GAME) && (mQuitGame))
+            {
+                *mQuitGame = true;
+            }
+            state = STATE_EXIT;
+        }
+        else if (mSwitchAccountServer->isMarked())
+        {
+            if ((state == STATE_GAME) && (mQuitGame))
+            {
+                *mQuitGame = true;
+            }
+            state = STATE_SWITCH_ACCOUNTSERVER_ATTEMPT;
+        }
+        else if (mSwitchCharacter->isMarked())
+        {
+            if (mQuitGame) *mQuitGame = true;
+
+            state = STATE_SWITCH_CHARACTER;
+        }
+
+    }
+    scheduleDelete();
+}
-- 
cgit v1.2.3-60-g2f50


From c09825097c0231c57f9ac416fae0003c5d68398c Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Tue, 7 Aug 2007 07:54:13 +0000
Subject: Marked most of the GUI as translatable.

---
 ChangeLog                   | 13 +++++++
 po/Makevars                 |  4 +--
 src/gui/char_select.cpp     | 82 ++++++++++++++++++++++-----------------------
 src/gui/confirm_dialog.cpp  |  5 +--
 src/gui/connection.cpp      |  6 ++--
 src/gui/equipmentwindow.cpp |  5 ++-
 src/gui/item_amount.cpp     | 12 ++++---
 src/gui/login.cpp           | 16 +++++----
 src/gui/menuwindow.cpp      | 19 ++++++-----
 src/gui/minimap.cpp         |  5 +--
 src/gui/ministatus.cpp      |  3 +-
 src/gui/npc_text.cpp        |  6 ++--
 src/gui/npclistdialog.cpp   |  8 +++--
 src/gui/ok_dialog.cpp       |  3 +-
 src/gui/popupmenu.cpp       | 25 ++++++++------
 src/gui/quitdialog.cpp      | 16 +++++----
 src/gui/register.cpp        | 47 ++++++++++++++------------
 src/gui/serverdialog.cpp    | 13 +++----
 src/gui/setup.cpp           | 15 +++++----
 src/gui/setup_audio.cpp     |  8 +++--
 src/gui/setup_joystick.cpp  | 18 +++++-----
 src/gui/setup_video.cpp     | 37 ++++++++++----------
 src/main.cpp                |  5 +--
 23 files changed, 205 insertions(+), 166 deletions(-)

(limited to 'src/gui/quitdialog.cpp')

diff --git a/ChangeLog b/ChangeLog
index cb5cb144..ef1c46c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-07  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
+
+	* po/Makevars, src/main.cpp: Replaced PACKAGE by tmw to	reduce
+	preprocessing hell. Set gettext charset to utf8.
+	* src/gui/menuwindow.cpp, src/gui/connection.cpp, src/gui/register.cpp,
+	src/gui/equipmentwindow.cpp, src/gui/quitdialog.cpp, src/gui/login.cpp,
+	src/gui/item_amount.cpp, src/gui/npclistdialog.cpp, src/gui/setup.cpp,
+	src/gui/char_select.cpp, src/gui/setup_audio.cpp, src/gui/npc_text.cpp,
+	src/gui/setup_video.cpp, src/gui/ministatus.cpp, src/gui/ok_dialog.cpp,
+	src/gui/confirm_dialog.cpp, src/gui/setup_joystick.cpp,
+	src/gui/serverdialog.cpp, src/gui/minimap.cpp, src/gui/popupmenu.cpp:
+	Marked as translatable.
+
 2007-08-06  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/Makefile.am, src/utils/strprintf.h, src/utils/strprintf.cpp:
diff --git a/po/Makevars b/po/Makevars
index a72f85a3..76e72f50 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,9 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-#PACKAGE = $(PACKAGE_NAME)
-DOMAIN = $(PACKAGE)
-#VERSION = $(PACKAGE_VERSION)
+DOMAIN = tmw
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 128a803e..d752cdb3 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -45,6 +45,8 @@
 #include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 // Defined in main.cpp, used here for setting the char create dialog
@@ -63,8 +65,8 @@ class CharDeleteConfirm : public ConfirmDialog
 };
 
 CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
-    ConfirmDialog("Confirm",
-                  "Are you sure you want to delete this character?", m),
+    ConfirmDialog(_("Confirm"),
+                  _("Are you sure you want to delete this character?"), m),
     master(m)
 {
 }
@@ -80,21 +82,21 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 
 CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
                                    LoginData *loginData):
-    Window("Select Character"),
+    Window(_("Select Character")),
     mCharInfo(charInfo), mCharSelected(false), mLoginData(loginData)
 {
 
-    mSelectButton = new Button("Ok", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mNewCharButton = new Button("New", "new", this);
-    mDelCharButton = new Button("Delete", "delete", this);
-    mPreviousButton = new Button("Previous", "previous", this);
-    mNextButton = new Button("Next", "next", this);
-    mUnRegisterButton = new Button("Unregister", "unregister", this);
-
-    mNameLabel = new gcn::Label("Name");
-    mLevelLabel = new gcn::Label("Level");
-    mMoneyLabel = new gcn::Label("Money");
+    mSelectButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mNewCharButton = new Button(_("New"), "new", this);
+    mDelCharButton = new Button(_("Delete"), "delete", this);
+    mPreviousButton = new Button(_("Previous"), "previous", this);
+    mNextButton = new Button(_("Next"), "next", this);
+    mUnRegisterButton = new Button(_("Unregister"), "unregister", this);
+
+    mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
+    mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
+    mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
     mPlayerBox = new PlayerBox();
 
     int w = 195;
@@ -198,9 +200,9 @@ void CharSelectDialog::updatePlayerInfo()
 
     if (pi)
     {
-        mNameLabel->setCaption(pi->getName());
-        mLevelLabel->setCaption("Lvl: " + toString(pi->getLevel()));
-        mMoneyLabel->setCaption("Money: " + toString(pi->getMoney()));
+        mNameLabel->setCaption(strprintf(_("Name: %s"), pi->getName().c_str()));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), pi->getLevel()));
+        mMoneyLabel->setCaption(strprintf(_("Money: %d"), pi->getMoney()));
         if (!mCharSelected)
         {
             mNewCharButton->setEnabled(false);
@@ -209,9 +211,9 @@ void CharSelectDialog::updatePlayerInfo()
         }
     }
     else {
-        mNameLabel->setCaption("Name");
-        mLevelLabel->setCaption("Level");
-        mMoneyLabel->setCaption("Money");
+        mNameLabel->setCaption(strprintf(_("Name: %s"), ""));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), 0));
+        mMoneyLabel->setCaption(strprintf(_("Money: %d"), 0));
         mNewCharButton->setEnabled(true);
         mDelCharButton->setEnabled(false);
         mSelectButton->setEnabled(false);
@@ -259,30 +261,30 @@ std::string CharSelectDialog::getName()
 }
 
 CharCreateDialog::CharCreateDialog(Window *parent, int slot):
-    Window("Create Character", true, parent), mSlot(slot)
+    Window(_("Create Character"), true, parent), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setHairStyle(rand() % NR_HAIR_STYLES);
     mPlayer->setHairColor(rand() % NR_HAIR_COLORS);
 
     mNameField = new TextField("");
-    mNameLabel = new gcn::Label("Name:");
+    mNameLabel = new gcn::Label(_("Name:"));
     mNextHairColorButton = new Button(">", "nextcolor", this);
     mPrevHairColorButton = new Button("<", "prevcolor", this);
-    mHairColorLabel = new gcn::Label("Hair Color:");
+    mHairColorLabel = new gcn::Label(_("Hair Color:"));
     mNextHairStyleButton = new Button(">", "nextstyle", this);
     mPrevHairStyleButton = new Button("<", "prevstyle", this);
-    mHairStyleLabel = new gcn::Label("Hair Style:");
-    mCreateButton = new Button("Create", "create", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mHairStyleLabel = new gcn::Label(_("Hair Style:"));
+    mCreateButton = new Button(_("Create"), "create", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
-    mAttributeLabel[0] = new gcn::Label("Strength:");
-    mAttributeLabel[1] = new gcn::Label("Agility:");
-    mAttributeLabel[2] = new gcn::Label("Dexterity:");
-    mAttributeLabel[3] = new gcn::Label("Vitality:");
-    mAttributeLabel[4] = new gcn::Label("Intelligence:");
-    mAttributeLabel[5] = new gcn::Label("Willpower:");
-    mAttributeLabel[6] = new gcn::Label("Charisma:");
+    mAttributeLabel[0] = new gcn::Label(_("Strength:"));
+    mAttributeLabel[1] = new gcn::Label(_("Agility:"));
+    mAttributeLabel[2] = new gcn::Label(_("Dexterity:"));
+    mAttributeLabel[3] = new gcn::Label(_("Vitality:"));
+    mAttributeLabel[4] = new gcn::Label(_("Intelligence:"));
+    mAttributeLabel[5] = new gcn::Label(_("Willpower:"));
+    mAttributeLabel[6] = new gcn::Label(_("Charisma:"));
     for (int i=0; i<7; i++)
     {
         mAttributeLabel[i]->setWidth(70);
@@ -290,7 +292,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
         mAttributeValue[i] = new gcn::Label("1");
     };
 
-    mAttributesLeft = new gcn::Label("Please distribute # points");
+    mAttributesLeft = new gcn::Label(strprintf(_("Please distribute %d points"), 99));
 
     mNameField->setActionEventId("create");
 
@@ -382,8 +384,8 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
             );
         }
         else {
-            new OkDialog("Error",
-                    "Your name needs to be at least 4 characters.", this);
+            new OkDialog(_("Error"),
+                    _("Your name needs to be at least 4 characters."), this);
         }
     }
     else if (event.getId() == "cancel") {
@@ -428,7 +430,7 @@ void CharCreateDialog::UpdateSliders()
     int pointsLeft = 70 - getDistributedPoints();
     if (pointsLeft == 0)
     {
-        mAttributesLeft->setCaption("Character stats OK");
+        mAttributesLeft->setCaption(_("Character stats OK"));
         mCreateButton->setEnabled(true);
     }
     else
@@ -436,13 +438,11 @@ void CharCreateDialog::UpdateSliders()
         mCreateButton->setEnabled(false);
         if (pointsLeft > 0)
         {
-            mAttributesLeft->setCaption(std::string("Please distribute " +
-                                        toString(pointsLeft) + " points"));
+            mAttributesLeft->setCaption(strprintf(_("Please distribute %d points"), pointsLeft));
         }
         else
         {
-            mAttributesLeft->setCaption(std::string("Please remove " +
-                                        toString(-pointsLeft) + " points"));
+            mAttributesLeft->setCaption(strprintf(_("Please remove %d points"), -pointsLeft));
         }
     }
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 0ff8be17..65ca27f7 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -27,14 +27,15 @@
 
 #include "button.h"
 
+#include "../utils/gettext.h"
 
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
     gcn::Label *textLabel = new gcn::Label(msg);
-    gcn::Button *yesButton = new Button("Yes", "yes", this);
-    gcn::Button *noButton = new Button("No", "no", this);
+    gcn::Button *yesButton = new Button(_("Yes"), "yes", this);
+    gcn::Button *noButton = new Button(_("No"), "no", this);
 
     int w = textLabel->getWidth() + 20;
     int inWidth = yesButton->getWidth() + noButton->getWidth() + 5;
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 3627689a..17b397ba 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -32,6 +32,8 @@
 
 #include "../main.h"
 
+#include "../utils/gettext.h"
+
 namespace {
     struct ConnectionActionListener : public gcn::ActionListener
     {
@@ -54,10 +56,10 @@ ConnectionDialog::ConnectionDialog(unsigned char previousState):
     ConnectionActionListener *connectionListener =
         new ConnectionActionListener(previousState);
 
-    Button *cancelButton = new Button("Cancel", "cancelButton",
+    Button *cancelButton = new Button(_("Cancel"), "cancelButton",
                                       connectionListener);
     mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128);
-    gcn::Label *label = new gcn::Label("Connecting...");
+    gcn::Label *label = new gcn::Label(_("Connecting..."));
 
     cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight());
     mProgressBar->setPosition(5, cancelButton->getY() - 25);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 27c97ea0..2ee57cd9 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -31,12 +31,11 @@
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
-#include "../utils/tostring.h"
+#include "../utils/gettext.h"
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
-    Window("Equipment"), mEquipment(equipment)
+    Window(_("Equipment")), mEquipment(equipment)
 {
-    setWindowName("Equipment");
     setDefaultSize(5, 230, 200, 120);
     loadWindowState();
 }
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index f72462f9..2e3ac4ad 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -31,8 +31,10 @@
 #include "../item.h"
 #include "../localplayer.h"
 
+#include "../utils/gettext.h"
+
 ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
-    Window("Select amount of items to drop.", true, parent),
+    Window("", true, parent),
     mItem(item)
 {
     // New labels
@@ -41,8 +43,8 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     // New buttons
     Button *minusButton = new Button("-", "Minus", this);
     Button *plusButton = new Button("+", "Plus", this);
-    Button *okButton = new Button("Okay", "Drop", this);
-    Button *cancelButton = new Button("Cancel", "Cancel", this);
+    Button *okButton = new Button(_("Ok"), "Drop", this);
+    Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
     mItemAmountSlide = new Slider(1.0, mItem->getQuantity());
 
     mItemAmountTextBox->setRange(1, mItem->getQuantity());
@@ -74,11 +76,11 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
 
     switch (usage) {
         case AMOUNT_TRADE_ADD:
-            setCaption("Select amount of items to trade.");
+            setCaption(_("Select amount of items to trade."));
             okButton->setActionEventId("AddTrade");
             break;
         case AMOUNT_ITEM_DROP:
-            setCaption("Select amount of items to drop.");
+            setCaption(_("Select amount of items to drop."));
             okButton->setActionEventId("Drop");
             break;
         default:
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 15ec6314..fccfc05a 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -36,17 +36,19 @@
 #include "passwordfield.h"
 #include "textfield.h"
 
+#include "../utils/gettext.h"
+
 LoginDialog::LoginDialog(LoginData *loginData):
-    Window("Login"), mLoginData(loginData)
+    Window(_("Login")), mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passLabel = new gcn::Label("Password:");
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passLabel = new gcn::Label(_("Password:"));
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
-    mKeepCheck = new CheckBox("Keep", mLoginData->remember);
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mRegisterButton = new Button("Register", "register", this);
+    mKeepCheck = new CheckBox(_("Keep"), mLoginData->remember);
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mRegisterButton = new Button(_("Register"), "register", this);
 
     const int width = 220;
     const int height = 100;
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 943cc6f0..bfa2f1f2 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -30,6 +30,8 @@
 #include "button.h"
 #include "windowcontainer.h"
 
+#include "../utils/gettext.h"
+
 extern Window *setupWindow;
 extern Window *inventoryWindow;
 extern Window *equipmentWindow;
@@ -47,28 +49,27 @@ namespace {
 }
 
 MenuWindow::MenuWindow():
-    Window("")
+    Window()
 {
     setResizable(false);
-    setWindowName("Menu");
     setMovable(false);
     setTitleBarHeight(0);
 
     // Buttons
-    const char *buttonNames[] =
+    static char const *buttonNames[] =
     {
-        "Status",
-        "Equipment",
-        "Inventory",
-        "Skills",
-        "Setup",
+        N_("Status"),
+        N_("Equipment"),
+        N_("Inventory"),
+        N_("Skills"),
+        N_("Setup"),
         0
     };
     int x = 0, y = 3, h = 0;
 
     for (const char **curBtn = buttonNames; *curBtn; curBtn++)
     {
-        gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
+        gcn::Button *btn = new Button(gettext(*curBtn), *curBtn, &listener);
         btn->setPosition(x, y);
         add(btn);
         x += btn->getWidth() + 3;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 2720225d..03a37e29 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -29,11 +29,12 @@
 
 #include "../resources/image.h"
 
+#include "../utils/gettext.h"
+
 Minimap::Minimap():
-    Window("Map"),
+    Window(_("MiniMap")),
     mMapImage(NULL)
 {
-    setWindowName("MiniMap");
     setDefaultSize(5, 25, 100, 100);
     loadWindowState();
 }
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 9a4c2273..3742be64 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -35,9 +35,8 @@
 #include "../utils/tostring.h"
 
 MiniStatusWindow::MiniStatusWindow():
-    Window("")
+    Window()
 {
-    setWindowName("MiniStatus");
     setResizable(false);
     setMovable(false);
     setTitleBarHeight(0);
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 2dd223bd..023307a7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -31,13 +31,15 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcTextDialog::NpcTextDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     mTextBox = new TextBox();
     mTextBox->setEditable(false);
     gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    Button *okButton = new Button("OK", "ok", this);
+    Button *okButton = new Button(_("Ok"), "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 1bcdc8ff..487bdf60 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -31,13 +31,15 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcListDialog::NpcListDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     mItemList = new ListBox(this);
     ScrollArea *scrollArea = new ScrollArea(mItemList);
-    Button *okButton = new Button("OK", "ok", this);
-    Button *cancelButton = new Button("Cancel", "cancel", this);
+    Button *okButton = new Button(_("Ok"), "ok", this);
+    Button *cancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index ca9d2a7b..37d66353 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -27,13 +27,14 @@
 
 #include "button.h"
 
+#include "../utils/gettext.h"
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
     gcn::Label *textLabel = new gcn::Label(msg);
-    gcn::Button *okButton = new Button("Ok", "ok", this);
+    gcn::Button *okButton = new Button(_("Ok"), "ok", this);
 
     int w = textLabel->getWidth() + 20;
     int h = textLabel->getHeight() + 25 + okButton->getHeight();
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index f308bbfd..9b1ce409 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -42,6 +42,9 @@
 #include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
@@ -74,9 +77,9 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 // Players can be traded with. Later also attack, follow and
                 // add as buddy will be options in this menu.
                 const std::string &name = mBeing->getName();
-                mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
+                mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
 
-                mBrowserBox->addRow("@@attack|Attack " + name + "@@");
+                mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
                 //mBrowserBox->addRow("@@follow|Follow " + name + "@@");
                 //mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
             }
@@ -85,7 +88,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
         case Being::NPC:
             // NPCs can be talked to (single option, candidate for removal
             // unless more options would be added)
-            mBrowserBox->addRow("@@talk|Talk To NPC@@");
+            mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
             break;
 
         default:
@@ -95,7 +98,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -107,11 +110,11 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
     // Floor item can be picked up (single option, candidate for removal)
     std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
-    mBrowserBox->addRow("@@pickup|Pick Up " + name + "@@");
+    mBrowserBox->addRow(strprintf(_("@@pickup|Pick Up %s@@"), name.c_str()));
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -214,15 +217,15 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     if (item->isEquipment())
     {
-        mBrowserBox->addRow("@@use|Equip@@");
+        mBrowserBox->addRow(_("@@use|Equip@@"));
     }
     else
-        mBrowserBox->addRow("@@use|Use@@");
+        mBrowserBox->addRow(_("@@use|Use@@"));
 
-    mBrowserBox->addRow("@@drop|Drop@@");
-    mBrowserBox->addRow("@@description|Description@@");
+    mBrowserBox->addRow(_("@@drop|Drop@@"));
+    mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 97be5f46..42c08080 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -31,16 +31,18 @@
 #include "button.h"
 #include "radiobutton.h"
 
+#include "../utils/gettext.h"
+
 QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
-    Window("Quit", true, NULL), mQuitGame(quitGame), mMyPointer(pointerToMe)
+    Window(_("Quit"), true, NULL), mQuitGame(quitGame), mMyPointer(pointerToMe)
 {
 
-    mLogoutQuit = new RadioButton("Quit", "quitdialog");
-    mForceQuit = new RadioButton("Quit", "quitdialog");
-    mSwitchAccountServer = new RadioButton("Switch server", "quitdialog");
-    mSwitchCharacter = new RadioButton("Switch character", "quitdialog");
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mLogoutQuit = new RadioButton(_("Quit"), "quitdialog");
+    mForceQuit = new RadioButton(_("Quit"), "quitdialog");
+    mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
+    mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(200, 91);
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index c8e01a6c..7e236a7d 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -41,6 +41,9 @@
 #include "textfield.h"
 #include "ok_dialog.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 void
 WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
@@ -57,20 +60,20 @@ WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 }
 
 RegisterDialog::RegisterDialog(LoginData *loginData):
-    Window("Register"),
+    Window(_("Register")),
     mWrongDataNoticeListener(new WrongDataNoticeListener()),
     mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passwordLabel = new gcn::Label("Password:");
-    gcn::Label *confirmLabel = new gcn::Label("Confirm:");
-    gcn::Label *emailLabel = new gcn::Label("Email:");
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passwordLabel = new gcn::Label(_("Password:"));
+    gcn::Label *confirmLabel = new gcn::Label(_("Confirm:"));
+    gcn::Label *emailLabel = new gcn::Label(_("Email:"));
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mEmailField = new TextField();
-    mRegisterButton = new Button("Register", "register", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mRegisterButton = new Button(_("Register"), "register", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     const int width = 220;
     const int height = 130;
@@ -155,45 +158,45 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         const std::string user = mUserField->getText();
         logger->log("RegisterDialog::register Username is %s", user.c_str());
 
-        std::stringstream errorMsg;
+        std::string errorMsg;
         int error = 0;
 
         if (user.length() < LEN_MIN_USERNAME)
         {
             // Name too short
-            errorMsg << "The username needs to be at least "
-                     << LEN_MIN_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be at least %d characters long."),
+                 LEN_MIN_USERNAME);
             error = 1;
         }
         else if (user.length() > LEN_MAX_USERNAME - 1 )
         {
             // Name too long
-            errorMsg << "The username needs to be less than "
-                     << LEN_MAX_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be less than %d characters long."),
+                 LEN_MAX_USERNAME);
             error = 1;
         }
         else if (mPasswordField->getText().length() < LEN_MIN_PASSWORD)
         {
             // Pass too short
-            errorMsg << "The password needs to be at least "
-                     << LEN_MIN_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be at least %d characters long."),
+                 LEN_MIN_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText().length() > LEN_MAX_PASSWORD - 1 )
         {
             // Pass too long
-            errorMsg << "The password needs to be less than "
-                     << LEN_MAX_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be less than %d characters long."),
+                 LEN_MAX_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText() != mConfirmField->getText())
         {
             // Password does not match with the confirmation one
-            errorMsg << "Passwords do not match.";
+            errorMsg = _("Passwords do not match.");
             error = 2;
         }
 
@@ -214,7 +217,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
                 mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
-            OkDialog *dlg = new OkDialog("Error", errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"), errorMsg);
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index b47ce749..2eada7ad 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -39,6 +39,7 @@
 #include "../logindata.h"
 #include "../main.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 const short MAX_SERVERLIST = 5;
@@ -98,10 +99,10 @@ void ServersListModel::addElement(Server server)
 }
 
 ServerDialog::ServerDialog(LoginData *loginData):
-    Window("Choose your Mana World Server"), mLoginData(loginData)
+    Window(_("Choose your Mana World Server")), mLoginData(loginData)
 {
-    gcn::Label *serverLabel = new gcn::Label("Server:");
-    gcn::Label *portLabel = new gcn::Label("Port:");
+    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
+    gcn::Label *portLabel = new gcn::Label(_("Port:"));
     mServerNameField = new TextField(mLoginData->hostname);
     mPortField = new TextField(toString(mLoginData->port));
 
@@ -134,8 +135,8 @@ ServerDialog::ServerDialog(LoginData *loginData):
     mDropDownListener = new DropDownListener(mServerNameField, mPortField,
             mMostUsedServersListModel, mMostUsedServersListBox);
 
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(200, 100);
 
@@ -201,7 +202,7 @@ ServerDialog::action(const gcn::ActionEvent &event)
         // Check login
         if (mServerNameField->getText().empty() || mPortField->getText().empty())
         {
-            OkDialog *dlg = new OkDialog("Error", "Enter the chosen server.");
+            OkDialog *dlg = new OkDialog(_("Error"), "Enter the chosen server.");
             dlg->addActionListener(mDropDownListener);
         }
         else
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3add3a18..3ea19059 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,6 +30,7 @@
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 
 extern Window *statusWindow;
 extern Window *minimap;
@@ -40,18 +41,18 @@ extern Window *helpWindow;
 extern Window *skillDialog;
 
 Setup::Setup():
-    Window("Setup")
+    Window(_("Setup"))
 {
     int width = 230;
     int height = 245;
     setContentSize(width, height);
 
-    const char *buttonNames[] = {
-        "Apply", "Cancel", "Reset Windows", 0
+    static char const *buttonNames[] = {
+        N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0
     };
     int x = width;
     for (const char **curBtn = buttonNames; *curBtn; ++curBtn) {
-        Button *btn = new Button(*curBtn, *curBtn, this);
+        Button *btn = new Button(gettext(*curBtn), *curBtn, this);
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
@@ -64,15 +65,15 @@ Setup::Setup():
     SetupTab *tab;
 
     tab = new Setup_Video();
-    panel->addTab(tab, "Video");
+    panel->addTab(tab, _("Video"));
     mTabs.push_back(tab);
 
     tab = new Setup_Audio();
-    panel->addTab(tab, "Audio");
+    panel->addTab(tab, _("Audio"));
     mTabs.push_back(tab);
 
     tab = new Setup_Joystick();
-    panel->addTab(tab, "Joystick");
+    panel->addTab(tab, _("Joystick"));
     mTabs.push_back(tab);
 
     add(panel);
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index e5aadf80..89c21e2b 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -33,18 +33,20 @@
 #include "../log.h"
 #include "../sound.h"
 
+#include "../utils/gettext.h"
+
 Setup_Audio::Setup_Audio():
     mMusicVolume((int)config.getValue("musicVolume", 60)),
     mSfxVolume((int)config.getValue("sfxVolume", 100)),
     mSoundEnabled(config.getValue("sound", 0)),
-    mSoundCheckBox(new CheckBox("Sound", mSoundEnabled)),
+    mSoundCheckBox(new CheckBox(_("Sound"), mSoundEnabled)),
     mSfxSlider(new Slider(0, 128)),
     mMusicSlider(new Slider(0, 128))
 {
     setOpaque(false);
 
-    gcn::Label *sfxLabel = new gcn::Label("Sfx volume");
-    gcn::Label *musicLabel = new gcn::Label("Music volume");
+    gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
+    gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
 
     mSfxSlider->setActionEventId("sfx");
     mMusicSlider->setActionEventId("music");
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 56f411d7..59cfefa4 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -30,12 +30,14 @@
 #include "../configuration.h"
 #include "../joystick.h"
 
+#include "../utils/gettext.h"
+
 extern Joystick *joystick;
 
 Setup_Joystick::Setup_Joystick():
-    mCalibrateLabel(new gcn::Label("Press the button to start calibration")),
-    mCalibrateButton(new Button("Calibrate", "calibrate", this)),
-    mJoystickEnabled(new CheckBox("Enable joystick"))
+    mCalibrateLabel(new gcn::Label(_("Press the button to start calibration"))),
+    mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
+    mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
     setOpaque(false);
     mJoystickEnabled->setPosition(10, 10);
@@ -65,13 +67,13 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
     else
     {
         if (joystick->isCalibrating()) {
-            mCalibrateButton->setCaption("Calibrate");
-            mCalibrateLabel->setCaption(
-                    "Press the button to start calibration");
+            mCalibrateButton->setCaption(_("Calibrate"));
+            mCalibrateLabel->setCaption
+                (_("Press the button to start calibration"));
             joystick->finishCalibration();
         } else {
-            mCalibrateButton->setCaption("Stop");
-            mCalibrateLabel->setCaption("Rotate the stick");
+            mCalibrateButton->setCaption(_("Stop"));
+            mCalibrateLabel->setCaption(_("Rotate the stick"));
             joystick->startCalibration();
         }
     }
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index cd1507a7..ee46396b 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -44,6 +44,7 @@
 #include "../log.h"
 #include "../main.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 extern Graphics *graphics;
@@ -109,11 +110,11 @@ Setup_Video::Setup_Video():
     mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
     mModeList(new ListBox(mModeListModel)),
-    mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
-    mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
-    mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)),
+    mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
+    mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
+    mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
-    mFpsCheckBox(new CheckBox("FPS Limit: ")),
+    mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
     mFpsField(new TextField()),
     mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 32)),
@@ -129,7 +130,7 @@ Setup_Video::Setup_Video():
     setOpaque(false);
 
     ScrollArea *scrollArea = new ScrollArea(mModeList);
-    gcn::Label *alphaLabel = new gcn::Label("Gui opacity");
+    gcn::Label *alphaLabel = new gcn::Label(_("Gui opacity"));
 
     mModeList->setEnabled(false);
 #ifndef USE_OPENGL
@@ -182,7 +183,7 @@ Setup_Video::Setup_Video():
     mOverlayDetailField->addKeyListener(this);
 
     mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
-    gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
+    gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
     scrollRadiusLabel->setPosition(90, 120);
     mScrollRadiusField->setPosition(180, 120);
     mScrollRadiusField->setWidth(30);
@@ -190,7 +191,7 @@ Setup_Video::Setup_Video():
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
     mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
-    gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness");
+    gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
     scrollLazinessLabel->setPosition(90, 140);
     mScrollLazinessField->setPosition(180, 140);
     mScrollLazinessField->setWidth(30);
@@ -198,20 +199,20 @@ Setup_Video::Setup_Video():
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
     mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
-    gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX");
+    gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
     overlayDetailLabel->setPosition(90, 160);
     mOverlayDetailField->setPosition(180, 160);
     mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
         case 0:
-            mOverlayDetailField->setCaption("off");
+            mOverlayDetailField->setCaption(_("off"));
             break;
         case 1:
-            mOverlayDetailField->setCaption("low");
+            mOverlayDetailField->setCaption(_("low"));
             break;
         case 2:
-            mOverlayDetailField->setCaption("high");
+            mOverlayDetailField->setCaption(_("high"));
             break;
     }
     mOverlayDetailSlider->setValue(mOverlayDetail);
@@ -264,8 +265,8 @@ void Setup_Video::apply()
                 }
             }
         } else {
-            new OkDialog("Switching to full screen",
-                    "Restart needed for changes to take effect.");
+            new OkDialog(_("Switching to full screen"),
+                    _("Restart needed for changes to take effect."));
         }
         config.setValue("screen", fullscreen ? 1 : 0);
     }
@@ -276,8 +277,8 @@ void Setup_Video::apply()
         config.setValue("opengl", mOpenGLCheckBox->isMarked() ? 1 : 0);
 
         // OpenGL can currently only be changed by restarting, notify user.
-        new OkDialog("Changing OpenGL",
-                "Applying change to OpenGL requires restart.");
+        new OkDialog(_("Changing OpenGL"),
+                _("Applying change to OpenGL requires restart."));
     }
 
     // FPS change
@@ -365,13 +366,13 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         switch (val)
         {
             case 0:
-                mOverlayDetailField->setCaption("off");
+                mOverlayDetailField->setCaption(_("off"));
                 break;
             case 1:
-                mOverlayDetailField->setCaption("low");
+                mOverlayDetailField->setCaption(_("low"));
                 break;
             case 2:
-                mOverlayDetailField->setCaption("high");
+                mOverlayDetailField->setCaption(_("high"));
                 break;
         }
         config.setValue("OverlayDetail", val);
diff --git a/src/main.cpp b/src/main.cpp
index bde0877e..9a51f2e4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -669,8 +669,9 @@ int main(int argc, char *argv[])
 
 #if ENABLE_NLS
     setlocale(LC_MESSAGES, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
+    bindtextdomain("tmw", LOCALEDIR);
+    bind_textdomain_codeset("tmw", "UTF-8");
+    textdomain("tmw");
 #endif
 
     // Initialize PhysicsFS
-- 
cgit v1.2.3-60-g2f50


From 563e5cb7056f1e8144426a8bc1cc8eb187eb11e7 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Sun, 21 Oct 2007 16:05:40 +0000
Subject: Plugged memory leak in quit dialog.

---
 ChangeLog              | 1 +
 src/gui/quitdialog.cpp | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'src/gui/quitdialog.cpp')

diff --git a/ChangeLog b/ChangeLog
index f1a55a99..be91d6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
 	redundant destructor.
 	* src/resources/monsterdb.cpp: Plugged memory leak in database reader.
 	* src/resources/spritedef.cpp: Plugged memory leak in sprites.
+	* src/gui/quitdialog.cpp: Plugged memory leak in quit dialog.
 
 2007-10-20  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 42c08080..c9d974a6 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -92,6 +92,11 @@ QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
 QuitDialog::~QuitDialog()
 {
     if (mMyPointer) *mMyPointer = NULL;
+    // Optional widgets, so delete them by hand.
+    delete mForceQuit;
+    delete mLogoutQuit;
+    delete mSwitchAccountServer;
+    delete mSwitchCharacter;
 }
 
 void
-- 
cgit v1.2.3-60-g2f50


From 4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 11 Apr 2008 13:31:52 +0000
Subject: Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch,
 but because of quite a bit of GUI differences there were additional changes
 and probably additional issues. You have been warned. ;)

Merged revisions 4045-4049,4051-4059 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines

  Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
  gcn::TabbedArea usage)
........
  r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines

  Fixed problem with row height in shop list box.
........
---
 ChangeLog                      |  36 +++++++++++++
 INSTALL                        |   2 +-
 NEWS                           |   2 +
 src/CMakeLists.txt             |   2 -
 src/Makefile.am                |   4 +-
 src/gui/button.cpp             |   2 +-
 src/gui/buy.cpp                |   5 +-
 src/gui/buy.h                  |   9 ++--
 src/gui/char_select.cpp        |   7 ++-
 src/gui/chat.cpp               |  26 ++++-----
 src/gui/checkbox.cpp           |   6 +--
 src/gui/checkbox.h             |   2 +-
 src/gui/guildlistbox.cpp       |  19 ++++---
 src/gui/guildlistbox.h         |  18 -------
 src/gui/guildwindow.cpp        |   4 +-
 src/gui/inttextbox.cpp         |   2 +-
 src/gui/inventorywindow.cpp    |   2 +-
 src/gui/inventorywindow.h      |   9 ++--
 src/gui/itemcontainer.cpp      |  17 +++---
 src/gui/itemcontainer.h        |  20 ++++---
 src/gui/itemshortcutwindow.cpp |   9 ++--
 src/gui/itemshortcutwindow.h   |   7 ++-
 src/gui/listbox.cpp            |  21 --------
 src/gui/listbox.h              |  31 -----------
 src/gui/login.cpp              |   2 +-
 src/gui/playerbox.cpp          |   8 +--
 src/gui/playerbox.h            |   2 +-
 src/gui/quitdialog.cpp         |  12 ++---
 src/gui/radiobutton.cpp        |   2 +-
 src/gui/scrollarea.cpp         |  24 ++++-----
 src/gui/scrollarea.h           |   2 +-
 src/gui/selectionlistener.h    |  68 ------------------------
 src/gui/sell.cpp               |   2 +-
 src/gui/sell.h                 |   7 ++-
 src/gui/setup_audio.cpp        |   4 +-
 src/gui/setup_joystick.cpp     |   6 +--
 src/gui/setup_video.cpp        |  18 +++----
 src/gui/shoplistbox.cpp        |  29 +---------
 src/gui/shoplistbox.h          |  28 ++--------
 src/gui/slider.cpp             |   2 +-
 src/gui/tabbedcontainer.cpp    |   4 +-
 src/gui/textbox.cpp            |   4 +-
 src/gui/textfield.cpp          |   8 +--
 src/gui/textfield.h            |   2 +-
 src/gui/trade.cpp              |   2 +-
 src/gui/trade.h                |   6 +--
 src/gui/widgets/dropdown.cpp   |  15 +++---
 src/gui/widgets/dropdown.h     |   2 +-
 src/gui/window.cpp             | 117 ++++++++---------------------------------
 src/gui/window.h               |  77 +++------------------------
 src/gui/windowlistener.h       |  86 ------------------------------
 51 files changed, 213 insertions(+), 588 deletions(-)
 delete mode 100644 src/gui/selectionlistener.h
 delete mode 100644 src/gui/windowlistener.h

(limited to 'src/gui/quitdialog.cpp')

diff --git a/ChangeLog b/ChangeLog
index 0477f10b..18f172fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 	Fixed some compiler warnings and don't try to load particle effects
 	when no file is set.
 
+2008-04-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp, src/gui/shoplistbox.h: Fixed problem with
+	row height in shop list box.
+
 2008-04-08  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/map.cpp, src/gui/viewport.cpp, src/tileset.h, src/map.h,
@@ -297,6 +302,15 @@
 	design decisions.
 	* data/items.xml: Fixed a few messed up slot numbers.
 
+2008-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/sell.cpp, src/gui/window.cpp, src/gui/inventorywindow.h,
+	src/gui/buy.h, src/gui/itemshortcutwindow.cpp,
+	src/gui/inventorywindow.cpp, src/gui/buy.cpp, src/gui/sell.h,
+	src/gui/window.h, src/gui/windowlistener.h,
+	src/gui/itemshortcutwindow.h, src/CMakeLists.txt, src/Makefile.am:
+	Used the gcn::WidgetListener instead of our WindowListener.
+
 2008-01-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/truetypefont.cpp: Image alpha should also be set to 1, in
@@ -316,6 +330,28 @@
 	* src/net/beinghandler.cpp, src/resources/spritedef.h: Fixed
 	broken communication of attack directions.
 
+2008-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/char_server.cpp, src/gui/window.cpp, src/gui/checkbox.h,
+	src/gui/playerbox.h, src/gui/button.cpp, src/gui/chat.cpp,
+	src/gui/slider.cpp, src/gui/tabbedcontainer.cpp, src/gui/textfield.h,
+	src/gui/shoplistbox.cpp, src/gui/register.cpp,
+	src/gui/radiobutton.cpp, src/gui/textbox.cpp, src/gui/login.cpp,
+	src/gui/setup_audio.cpp, src/gui/setup_video.cpp,
+	src/gui/textfield.cpp, src/gui/playerbox.cpp,
+	src/gui/setup_joystick.cpp, src/gui/scrollarea.h,
+	src/gui/windowlistener.h, src/gui/checkbox.cpp,
+	src/gui/scrollarea.cpp: Compile against Guichan 0.8.0. Some issues
+	with ShopListBox left and not trying to use their new TabbedArea,
+	SelectionListener and WidgetListener yet. Also needs more testing.
+	* src/gui/trade.cpp, src/gui/sell.cpp, src/gui/inventorywindow.h,
+	src/gui/selectionlistener.h, src/gui/itemcontainer.h,
+	src/gui/shoplistbox.cpp, src/gui/shoplistbox.h, src/gui/listbox.h,
+	src/gui/buy.h, src/gui/inventorywindow.cpp, src/gui/buy.cpp,
+	src/gui/itemcontainer.cpp, src/gui/sell.h, src/gui/trade.h,
+	src/gui/listbox.cpp, src/CMakeLists.txt, src/Makefile.am: Used the
+	gcn::SelectionListener instead of our own.
+
 2008-01-20  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/items.xml: Added max-per-slot property to all items.
diff --git a/INSTALL b/INSTALL
index ea8a4f81..a346a2e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,7 +21,7 @@ and some libraries. The required libraries are:
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
 * SDL_ttf           http://www.libsdl.org/projects/SDL_ttf/
 * ENet 1.2          http://enet.bespin.org/
-* Guichan 0.7.x     http://guichan.sourceforge.net/
+* Guichan 0.8.x     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
 * zlib 1.2.x        http://www.gzip.org/zlib/
diff --git a/NEWS b/NEWS
index ebdae676..51a181d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+0.0.24.1 (7 April 2008)
+
 0.0.24 (24 December 2007)
 - Added female specific hair styles
 - Added user-definable key settings
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cda186d..b783efcb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,7 +148,6 @@ SET(SRCS
     gui/scrollarea.h
     gui/sdlinput.cpp
     gui/sdlinput.h
-    gui/selectionlistener.h
     gui/sell.cpp
     gui/sell.h
     gui/serverdialog.cpp
@@ -198,7 +197,6 @@ SET(SRCS
     gui/window.h
     gui/windowcontainer.cpp
     gui/windowcontainer.h
-    gui/windowlistener.h
     net/beinghandler.cpp
     net/beinghandler.h
     net/buysellhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d9b3fc8d..c46fe481 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/scrollarea.h \
 	      gui/sdlinput.cpp \
 	      gui/sdlinput.h \
-	      gui/selectionlistener.h \
 	      gui/sell.cpp \
 	      gui/sell.h \
 	      gui/serverdialog.cpp \
@@ -150,7 +149,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/window.h \
 	      gui/windowcontainer.cpp \
 	      gui/windowcontainer.h \
-	      gui/windowlistener.h \
 	      net/beinghandler.h \
 	      net/beinghandler.cpp \
 	      net/buysellhandler.h \
@@ -340,4 +338,4 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 INCLUDES =					\
 	$(all_includes)				\
 	-DTMW_DATADIR=\""$(pkgdatadir)/"\"      \
-	-DLOCALEDIR=\""$(localedir)"\"
\ No newline at end of file
+	-DLOCALEDIR=\""$(localedir)"\"
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index e47f90f8..c6bc4ccb 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -82,7 +82,7 @@ Button::Button(const std::string& caption, const std::string &actionEventId,
 
 void Button::init()
 {
-    setBorderSize(0);
+    setFrameSize(0);
 
     if (mInstances == 0)
     {
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index d2e12a85..49d19675 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -178,9 +178,8 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void BuyDialog::selectionChanged(const SelectionEvent &event)
+void BuyDialog::valueChanged(const gcn::SelectionEvent &event)
 {
-
     // Reset amount of items and update labels
     mAmountItems = 1;
     mSlider->setValue(1);
@@ -192,7 +191,7 @@ void BuyDialog::selectionChanged(const SelectionEvent &event)
 void
 BuyDialog::updateButtonsAndLabels()
 {
-    int selectedItem = mShopItemList->getSelected();
+    const int selectedItem = mShopItemList->getSelected();
     int price = 0;
 
     if (selectedItem > -1)
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 4e129611..ec7419be 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -25,9 +25,9 @@
 #define _TMW_BUY_H
 
 #include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
 
 #include "window.h"
-#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -40,7 +40,8 @@ class ListBox;
  *
  * \ingroup Interface
  */
-class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
+class BuyDialog : public Window, public gcn::ActionListener,
+    gcn::SelectionListener
 {
     public:
         /**
@@ -82,10 +83,8 @@ class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
 
         /**
          * Updates the labels according to the selected item.
-         *
-         * @see SelectionListener::selectionChanged
          */
-        void selectionChanged(const SelectionEvent &event);
+        void valueChanged(const gcn::SelectionEvent &event);
 
         /**
          * Returns the name of item number i in the shop inventory.
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index a691f4ec..b2d3b53e 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -323,7 +323,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     mFemale->setPosition( 100, 120 );
 
     // Default to a Male character
-    mMale->setMarked(true);
+    mMale->setSelected(true);
 
     mMale->setActionEventId("gender");
     mFemale->setActionEventId("gender");
@@ -375,13 +375,12 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
             mCreateButton->setEnabled(false);
 
             unsigned int genderSelected;
-            if( mMale->isMarked() ){
+            if (mMale->isSelected()) {
                 genderSelected = GENDER_MALE;
             } else {
                 genderSelected = GENDER_FEMALE;
             }
 
-
             Net::AccountServer::Account::createCharacter(
                     getName(),
                     mPlayer->getHairStyle(),
@@ -418,7 +417,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         UpdateSliders();
     }
     else if (event.getId() == "gender"){
-        if( mMale->isMarked() ) {
+        if (mMale->isSelected()) {
             mPlayer->setGender(GENDER_MALE);
         } else {
             mPlayer->setGender(GENDER_FEMALE);
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f6b54d29..1efee8ed 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -67,14 +67,14 @@ ChatWindow::ChatWindow():
     textOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
     ScrollArea *scrollArea = new ScrollArea(textOutput);
     scrollArea->setPosition(
-            scrollArea->getBorderSize(), scrollArea->getBorderSize());
+            scrollArea->getFrameSize(), scrollArea->getFrameSize());
     scrollArea->setScrollPolicy(
             gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
     scrollArea->setOpaque(false);
 
     GCContainer *tab = new GCContainer();
-    tab->setWidth(getWidth() - 2 * tab->getBorderSize());
-    tab->setHeight(getHeight() - 2 * tab->getBorderSize());
+    tab->setWidth(getWidth() - 2 * tab->getFrameSize());
+    tab->setHeight(getHeight() - 2 * tab->getFrameSize());
     tab->setOpaque(false);
     tab->add(scrollArea);
 
@@ -109,15 +109,15 @@ ChatWindow::logic()
 
     const gcn::Rectangle area = getChildrenArea();
 
-    mChatInput->setPosition(mChatInput->getBorderSize(),
+    mChatInput->setPosition(mChatInput->getFrameSize(),
                             area.height - mChatInput->getHeight() -
-                                mChatInput->getBorderSize());
-    mChatInput->setWidth(area.width - 2 * mChatInput->getBorderSize());
-    mContainer->setWidth(area.width - 2 * mContainer->getBorderSize());
-    mContainer->setHeight(area.height - 2 * mContainer->getBorderSize() -
+                                mChatInput->getFrameSize());
+    mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
+    mContainer->setWidth(area.width - 2 * mContainer->getFrameSize());
+    mContainer->setHeight(area.height - 2 * mContainer->getFrameSize() -
                           mChatInput->getHeight() - 5);
-    mScrollArea->setWidth(area.width - 2 * mScrollArea->getBorderSize());
-    mScrollArea->setHeight(area.height - 2 * mScrollArea->getBorderSize() -
+    mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
+    mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
             mChatInput->getHeight() - 26);
     Window::logic();
 }
@@ -475,12 +475,12 @@ ChatWindow::createNewChannelTab(std::string channelName)
     textOutput->setOpaque(false);
     textOutput->disableLinksAndUserColors();
     ScrollArea *scrollArea = new ScrollArea(textOutput);
-    scrollArea->setPosition(scrollArea->getBorderSize(), scrollArea->getBorderSize());
+    scrollArea->setPosition(scrollArea->getFrameSize(), scrollArea->getFrameSize());
     scrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
     scrollArea->setOpaque(false);
     GCContainer *tab = new GCContainer();
-    tab->setWidth(getWidth() - 2 * tab->getBorderSize());
-    tab->setHeight(getHeight() - 2 * tab->getBorderSize());
+    tab->setWidth(getWidth() - 2 * tab->getFrameSize());
+    tab->setHeight(getHeight() - 2 * tab->getFrameSize());
     tab->add(scrollArea);
     tab->setOpaque(false);
     mContainer->addTab(tab, channelName);
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index fab4780c..5b300d33 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -34,8 +34,8 @@ Image *CheckBox::checkBoxChecked;
 Image *CheckBox::checkBoxDisabled;
 Image *CheckBox::checkBoxDisabledChecked;
 
-CheckBox::CheckBox(const std::string& caption, bool marked):
-    gcn::CheckBox(caption, marked)
+CheckBox::CheckBox(const std::string& caption, bool selected):
+    gcn::CheckBox(caption, selected)
 {
     if (instances == 0)
     {
@@ -68,7 +68,7 @@ void CheckBox::drawBox(gcn::Graphics* graphics)
 {
     Image *box;
 
-    if (mMarked) {
+    if (isSelected()) {
         if (isEnabled()) {
             box = checkBoxChecked;
         } else {
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 468a7f38..262e63ae 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -40,7 +40,7 @@ class CheckBox : public gcn::CheckBox {
         /**
          * Constructor.
          */
-        CheckBox(const std::string& caption, bool marked = false);
+        CheckBox(const std::string& caption, bool selected = false);
 
         /**
          * Destructor.
diff --git a/src/gui/guildlistbox.cpp b/src/gui/guildlistbox.cpp
index 1a392d2d..11661235 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/guildlistbox.cpp
@@ -30,27 +30,26 @@
 GuildListBox::GuildListBox():
     ListBox(NULL)
 {
-        
 }
 
 void GuildListBox::draw(gcn::Graphics *graphics)
 {
     if (!mListModel)
         return;
-    
+
     graphics->setColor(gcn::Color(110, 160, 255));
     graphics->setFont(getFont());
-    
+
     int fontHeight = getFont()->getHeight();
-    
+
     // Draw rectangle below the selected list element
     if (mSelected >= 0) {
         graphics->fillRectangle(gcn::Rectangle(0, fontHeight * mSelected,
                                                getWidth(), fontHeight));
     }
-    
+
     // TODO: Add online status image
-    
+
     // Draw the list elements
     for (int i = 0, y = 0;
          i < mListModel->getNumberOfElements();
@@ -71,7 +70,7 @@ void GuildListBox::setSelected(int selected)
         // Update mSelected with bounds checking
         mSelected = std::min(mListModel->getNumberOfElements() - 1,
                              std::max(-1, selected));
-        
+
         gcn::Widget *parent;
         parent = (gcn::Widget*)getParent();
         if (parent)
@@ -82,8 +81,8 @@ void GuildListBox::setSelected(int selected)
             parent->showWidgetPart(this, scroll);
         }
     }
-    
-    fireSelectionChangedEvent();
+
+    distributeValueChangedEvent();
 }
 
 void GuildListBox::mousePressed(gcn::MouseEvent &event)
@@ -93,6 +92,6 @@ void GuildListBox::mousePressed(gcn::MouseEvent &event)
         // TODO: Add guild functions, ie private messaging
         int y = event.getY();
         setSelected(y / getFont()->getHeight());
-        generateAction();
+        distributeActionEvent();
     }
 }
diff --git a/src/gui/guildlistbox.h b/src/gui/guildlistbox.h
index befaef1f..262012a4 100644
--- a/src/gui/guildlistbox.h
+++ b/src/gui/guildlistbox.h
@@ -49,24 +49,6 @@ public:
 
     void mousePressed(gcn::MouseEvent &event);
 
-    /**
-     * Adds a listener to the list that's notified each time a change to
-     * the selection occurs.
-     */
-    void addSelectionListener(SelectionListener *listener)
-    {
-        mListeners.push_back(listener);
-    }
-
-    /**
-     * Removes a listener from the list that's notified each time a change
-     * to the selection occurs.
-     */
-    void removeSelectionListener(SelectionListener *listener)
-    {
-        mListeners.remove(listener);
-    }
-
     /**
      * Sets the index of the selected element.
      */
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 970c6ce1..eb0faa35 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -173,8 +173,8 @@ void GuildWindow::newGuildTab(const std::string &guildName)
 
     // Create new tab
     GCContainer *tab = new GCContainer();
-    tab->setWidth(getWidth() - 2 * tab->getBorderSize());
-    tab->setHeight(getHeight() - 2 * tab->getBorderSize());
+    tab->setWidth(getWidth() - 2 * tab->getFrameSize());
+    tab->setHeight(getHeight() - 2 * tab->getFrameSize());
     tab->setOpaque(false);
     ListBox *list = new ListBox();
     list->setListModel(player_node->getGuild(guildName));
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 5ae3dd93..17e87afd 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -51,7 +51,7 @@ IntTextBox::keyPressed(gcn::KeyEvent &event)
     int i;
     s >> i;
     setInt(i);
-    generateAction();
+    distributeActionEvent();
 }
 
 void IntTextBox::setRange(int min, int max)
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 0ef1ab35..bd224cf0 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -144,7 +144,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
     }
 }
 
-void InventoryWindow::selectionChanged(const SelectionEvent &event)
+void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
 {
     Item *item = mItems->getItem();
     ItemInfo const *info = item ? &item->getInfo() : NULL;
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 34883c1c..01fb118c 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -26,10 +26,9 @@
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
-
+#include <guichan/selectionlistener.hpp>
 #include <guichan/widgets/checkbox.hpp>
 
-#include "selectionlistener.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -45,7 +44,7 @@ class ItemContainer;
 class InventoryWindow : public Window,
                         public gcn::ActionListener,
                         public gcn::KeyListener,
-                        public SelectionListener
+                        public gcn::SelectionListener
 {
     public:
         /**
@@ -82,10 +81,8 @@ class InventoryWindow : public Window,
 
         /**
          * Updates labels to currently selected item.
-         *
-         * @see SelectionListener::selectionChanged.
          */
-        void selectionChanged(const SelectionEvent &event);
+        void valueChanged(const gcn::SelectionEvent &event);
 
     private:
         void updateButtons();    /**< Updates button states. */
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 1abb8f0b..eddb6011 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -24,9 +24,9 @@
 #include "itemcontainer.h"
 
 #include <guichan/mouseinput.hpp>
+#include <guichan/selectionlistener.hpp>
 
 #include "sdlinput.h"
-#include "selectionlistener.h"
 
 #include "../graphics.h"
 #include "../inventory.h"
@@ -159,20 +159,19 @@ void ItemContainer::setSelectedItem(Item *item)
     if (mSelectedItem != item)
     {
         mSelectedItem = item;
-        fireSelectionChangedEvent();
+        distributeValueChangedEvent();
     }
 }
 
-void
-ItemContainer::fireSelectionChangedEvent()
+void ItemContainer::distributeValueChangedEvent()
 {
-    SelectionEvent event(this);
-    SelectionListeners::iterator i_end = mListeners.end();
-    SelectionListeners::iterator i;
+    SelectionListenerIterator iter;
 
-    for (i = mListeners.begin(); i != i_end; ++i)
+    for (iter = mSelectionListeners.begin(); iter != mSelectionListeners.end();
+         ++iter)
     {
-        (*i)->selectionChanged(event);
+        gcn::SelectionEvent event(this);
+        (*iter)->valueChanged(event);
     }
 }
 
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 8be338dd..fad59171 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -34,7 +34,10 @@
 class Image;
 class Inventory;
 class Item;
-class SelectionListener;
+
+namespace gcn {
+    class SelectionListener;
+}
 
 /**
  * An item container. Used to show items in inventory and trade dialog.
@@ -104,18 +107,18 @@ class ItemContainer : public gcn::Widget,
          * Adds a listener to the list that's notified each time a change to
          * the selection occurs.
          */
-        void addSelectionListener(SelectionListener *listener)
+        void addSelectionListener(gcn::SelectionListener *listener)
         {
-            mListeners.push_back(listener);
+            mSelectionListeners.push_back(listener);
         }
 
         /**
          * Removes a listener from the list that's notified each time a change
          * to the selection occurs.
          */
-        void removeSelectionListener(SelectionListener *listener)
+        void removeSelectionListener(gcn::SelectionListener *listener)
         {
-            mListeners.remove(listener);
+            mSelectionListeners.remove(listener);
         }
 
         enum {
@@ -145,7 +148,7 @@ class ItemContainer : public gcn::Widget,
         /**
          * Sends out selection events to the list of selection listeners.
          */
-        void fireSelectionChangedEvent();
+        void distributeValueChangedEvent();
 
         /**
          * Gets the slot index based on the cursor position.
@@ -164,7 +167,10 @@ class ItemContainer : public gcn::Widget,
         bool mSwapItems;
         int mDragPosX, mDragPosY;
 
-        std::list<SelectionListener*> mListeners;
+        typedef std::list<gcn::SelectionListener*> SelectionListenerList;
+        typedef SelectionListenerList::iterator SelectionListenerIterator;
+
+        SelectionListenerList mSelectionListeners;
 };
 
 #endif
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index cf266290..c7b2bd05 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -38,7 +38,7 @@ ItemShortcutWindow::ItemShortcutWindow()
 
     mItems = new ItemShortcutContainer();
 
-    int border = SCROLL_PADDING * 2 + getPadding() * 2;
+    const int border = SCROLL_PADDING * 2 + getPadding() * 2;
     setMinWidth(mItems->getBoxWidth() + border);
     setMinHeight(mItems->getBoxHeight() + border);
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
@@ -50,7 +50,6 @@ ItemShortcutWindow::ItemShortcutWindow()
 
     add(mInvenScroll);
 
-    addWindowListener(this);
     loadWindowState("ItemShortcut");
 }
 
@@ -65,9 +64,11 @@ void ItemShortcutWindow::logic()
     Window::logic();
 }
 
-void ItemShortcutWindow::windowResized(const WindowEvent &event)
+void ItemShortcutWindow::widgetResized(const gcn::Event &event)
 {
-    const gcn::Rectangle area = getChildrenArea();
+    Window::widgetResized(event);
+
+    const gcn::Rectangle &area = getChildrenArea();
 
     mInvenScroll->setSize(
             area.width - SCROLL_PADDING,
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 1dde8686..51685e49 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -25,7 +25,6 @@
 #define _TMW_ITEMSHORTCUTWINDOW_H
 
 #include "window.h"
-#include "windowlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -36,7 +35,7 @@ class ItemShortcutContainer;
  *
  * \ingroup Interface
  */
-class ItemShortcutWindow : public Window, WindowListener
+class ItemShortcutWindow : public Window
 {
     public:
         /**
@@ -55,9 +54,9 @@ class ItemShortcutWindow : public Window, WindowListener
         void logic();
 
         /**
-         * Called whenever the window is resized.
+         * Called whenever the widget changes size.
          */
-        void windowResized(const WindowEvent &event);
+        void widgetResized(const gcn::Event &event);
 
     private:
         ItemShortcutContainer *mItems;
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 61c7e078..ac18c2cd 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -23,8 +23,6 @@
 
 #include "listbox.h"
 
-#include "selectionlistener.h"
-
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
@@ -67,13 +65,6 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-ListBox::setSelected(int selected)
-{
-    gcn::ListBox::setSelected(selected);
-    fireSelectionChangedEvent();
-}
-
 void
 ListBox::mouseDragged(gcn::MouseEvent &event)
 {
@@ -81,15 +72,3 @@ ListBox::mouseDragged(gcn::MouseEvent &event)
     // selection to be updated as is default in many GUIs.
     mousePressed(event);
 }
-
-void ListBox::fireSelectionChangedEvent()
-{
-    SelectionEvent event(this);
-    SelectionListeners::iterator i_end = mListeners.end();
-    SelectionListeners::iterator i;
-
-    for (i = mListeners.begin(); i != i_end; ++i)
-    {
-        (*i)->selectionChanged(event);
-    }
-}
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 21172a22..03a8b541 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -50,37 +50,6 @@ class ListBox : public gcn::ListBox
         void draw(gcn::Graphics *graphics);
 
         void mouseDragged(gcn::MouseEvent &event);
-
-        /**
-         * Adds a listener to the list that's notified each time a change to
-         * the selection occurs.
-         */
-        void addSelectionListener(SelectionListener *listener)
-        {
-            mListeners.push_back(listener);
-        }
-
-        /**
-         * Removes a listener from the list that's notified each time a change
-         * to the selection occurs.
-         */
-        void removeSelectionListener(SelectionListener *listener)
-        {
-            mListeners.remove(listener);
-        }
-
-        /**
-         * Sets the index of the selected element.
-         */
-        virtual void setSelected(int selected);
-
-    protected:
-        /**
-         * Sends out selection events to the list of selection listeners.
-         */
-        void fireSelectionChangedEvent();
-
-        std::list<SelectionListener*> mListeners;
 };
 
 #endif
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 57ad00c5..f1b32d48 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -94,7 +94,7 @@ LoginDialog::action(const gcn::ActionEvent &event)
     {
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
-        mLoginData->remember = mKeepCheck->isMarked();
+        mLoginData->remember = mKeepCheck->isSelected();
         mLoginData->registerLogin = false;
 
         mOkButton->setEnabled(false);
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 8e5f1827..2c633b72 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -39,7 +39,7 @@ ImageRect PlayerBox::background;
 PlayerBox::PlayerBox(const Player *player):
     mPlayer(player)
 {
-    setBorderSize(2);
+    setFrameSize(2);
 
     if (instances == 0)
     {
@@ -83,7 +83,7 @@ PlayerBox::draw(gcn::Graphics *graphics)
     {
         // Draw character
         int x, y, bs;
-        bs = getBorderSize();
+        bs = getFrameSize();
         x = getWidth() / 2 - 16 + bs;
         y = getHeight() / 2 + bs;
         mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
@@ -91,10 +91,10 @@ PlayerBox::draw(gcn::Graphics *graphics)
 }
 
 void
-PlayerBox::drawBorder(gcn::Graphics *graphics)
+PlayerBox::drawFrame(gcn::Graphics *graphics)
 {
     int w, h, bs;
-    bs = getBorderSize();
+    bs = getFrameSize();
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 6bba1b51..c226e750 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -64,7 +64,7 @@ class PlayerBox : public gcn::ScrollArea
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawBorder(gcn::Graphics *graphics);
+        void drawFrame(gcn::Graphics *graphics);
 
     private:
         const Player *mPlayer;       /**< The character used for display */
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index c9d974a6..7ed4f913 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -65,13 +65,13 @@ QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
         state == STATE_LOGIN_ATTEMPT ||
         state == STATE_UPDATE)
     {
-        mForceQuit->setMarked(true);
+        mForceQuit->setSelected(true);
         add(mForceQuit);
     }
     else
     {
         // Only added if we are connected to an accountserver or gameserver
-        mLogoutQuit->setMarked(true);
+        mLogoutQuit->setSelected(true);
         add(mLogoutQuit);
         add(mSwitchAccountServer);
 
@@ -104,11 +104,11 @@ QuitDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
-        if (mForceQuit->isMarked())
+        if (mForceQuit->isSelected())
         {
             state = STATE_FORCE_QUIT;
         }
-        else if (mLogoutQuit->isMarked())
+        else if (mLogoutQuit->isSelected())
         {
             if ((state == STATE_GAME) && (mQuitGame))
             {
@@ -116,7 +116,7 @@ QuitDialog::action(const gcn::ActionEvent &event)
             }
             state = STATE_EXIT;
         }
-        else if (mSwitchAccountServer->isMarked())
+        else if (mSwitchAccountServer->isSelected())
         {
             if ((state == STATE_GAME) && (mQuitGame))
             {
@@ -124,7 +124,7 @@ QuitDialog::action(const gcn::ActionEvent &event)
             }
             state = STATE_SWITCH_ACCOUNTSERVER_ATTEMPT;
         }
-        else if (mSwitchCharacter->isMarked())
+        else if (mSwitchCharacter->isSelected())
         {
             if (mQuitGame) *mQuitGame = true;
 
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index e318116a..0ac4dea8 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -67,7 +67,7 @@ void RadioButton::drawBox(gcn::Graphics* graphics)
 {
     Image *box = NULL;
 
-    if (mMarked) {
+    if (isSelected()) {
         if (isEnabled()) {
             box = radioChecked;
         } else {
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index cf555ef4..97384fa3 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -153,12 +153,12 @@ void ScrollArea::logic()
         if (getHorizontalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
         {
             content->setWidth(getChildrenArea().width -
-                    2 * content->getBorderSize());
+                    2 * content->getFrameSize());
         }
         if (getVerticalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
         {
             content->setHeight(getChildrenArea().height -
-                    2 * content->getBorderSize());
+                    2 * content->getFrameSize());
         }
     }
 }
@@ -204,15 +204,15 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     {
         graphics->pushClipArea(getChildrenArea());
 
-        if (content->getBorderSize() > 0)
+        if (content->getFrameSize() > 0)
         {
             gcn::Rectangle rec = content->getDimension();
-            rec.x -= content->getBorderSize();
-            rec.y -= content->getBorderSize();
-            rec.width += 2 * content->getBorderSize();
-            rec.height += 2 * content->getBorderSize();
+            rec.x -= content->getFrameSize();
+            rec.y -= content->getFrameSize();
+            rec.width += 2 * content->getFrameSize();
+            rec.height += 2 * content->getFrameSize();
             graphics->pushClipArea(rec);
-            content->drawBorder(graphics);
+            content->drawFrame(graphics);
             graphics->popClipArea();
         }
 
@@ -223,9 +223,9 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     }
 }
 
-void ScrollArea::drawBorder(gcn::Graphics *graphics)
+void ScrollArea::drawFrame(gcn::Graphics *graphics)
 {
-    int bs = getBorderSize();
+    int bs = getFrameSize();
     int w = getWidth() + bs * 2;
     int h = getHeight() + bs * 2;
 
@@ -240,10 +240,10 @@ void ScrollArea::setOpaque(bool opaque)
     mOpaque = opaque;
 
     if (mOpaque) {
-        setBorderSize(2);
+        setFrameSize(2);
     }
     else {
-        setBorderSize(0);
+        setFrameSize(0);
     }
 }
 
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 504842cc..9fb7093d 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -65,7 +65,7 @@ class ScrollArea : public gcn::ScrollArea {
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawBorder(gcn::Graphics *graphics);
+        void drawFrame(gcn::Graphics *graphics);
 
         /**
          * Sets whether the widget should draw its background or not.
diff --git a/src/gui/selectionlistener.h b/src/gui/selectionlistener.h
deleted file mode 100644
index 917a4871..00000000
--- a/src/gui/selectionlistener.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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$
- */
-
-#ifndef _TMW_SELECTIONLISTENER_H__
-#define _TMW_SELECTIONLISTENER_H__
-
-#include <guichan/widget.hpp>
-#include <guichan/event.hpp>
-
-/**
- * An event that characterizes a change in the current selection.
- *
- * \ingroup GUI
- */
-class SelectionEvent : public gcn::Event
-{
-    public:
-        /**
-         * Constructor.
-         */
-        SelectionEvent(gcn::Widget *source):
-            gcn::Event(source)
-        {
-        }
-};
-
-/**
- * The listener that's notified when a selection value changes.
- *
- * \ingroup GUI
- */
-class SelectionListener
-{
-    public:
-        /**
-         * Virtual destructor.
-         */
-        virtual ~SelectionListener() {}
-
-        /**
-         * Called whenever the value of the selection changes.
-         */
-        virtual void selectionChanged(const SelectionEvent &event) = 0;
-};
-
-typedef std::list<SelectionListener*> SelectionListeners;
-
-#endif
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index bc683c0b..e101ad39 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -182,7 +182,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void SellDialog::selectionChanged(const SelectionEvent &event)
+void SellDialog::valueChanged(const gcn::SelectionEvent &event)
 {
     // Reset amount of items and update labels
     mAmountItems = 1;
diff --git a/src/gui/sell.h b/src/gui/sell.h
index cde862d5..63a16770 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -25,10 +25,9 @@
 #define _TMW_SELL_H
 
 #include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
 
 #include "window.h"
-#include "selectionlistener.h"
-#include "windowlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -41,7 +40,7 @@ class ShopListBox;
  *
  * \ingroup Interface
  */
-class SellDialog : public Window, gcn::ActionListener, SelectionListener
+class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
 {
     public:
         /**
@@ -76,7 +75,7 @@ class SellDialog : public Window, gcn::ActionListener, SelectionListener
          *
          * @see SelectionListener::selectionChanged
          */
-        void selectionChanged(const SelectionEvent &event);
+        void valueChanged(const gcn::SelectionEvent &event);
 
         /**
          * Gives Player's Money amount
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 89c21e2b..a02b3c20 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -72,7 +72,7 @@ Setup_Audio::Setup_Audio():
 
 void Setup_Audio::apply()
 {
-    if (mSoundCheckBox->isMarked())
+    if (mSoundCheckBox->isSelected())
     {
         config.setValue("sound", 1);
         try {
@@ -97,7 +97,7 @@ void Setup_Audio::apply()
 
 void Setup_Audio::cancel()
 {
-    mSoundCheckBox->setMarked(mSoundEnabled);
+    mSoundCheckBox->setSelected(mSoundEnabled);
 
     sound.setSfxVolume(mSfxVolume);
     mSfxSlider->setValue(mSfxVolume);
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 59cfefa4..dfa446ab 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -45,7 +45,7 @@ Setup_Joystick::Setup_Joystick():
     mCalibrateButton->setPosition(10, 30 + mCalibrateLabel->getHeight());
 
     mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0;
-    mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
+    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 
     mJoystickEnabled->addActionListener(this);
 
@@ -62,7 +62,7 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
 
     if (event.getSource() == mJoystickEnabled)
     {
-        joystick->setEnabled(mJoystickEnabled->isMarked());
+        joystick->setEnabled(mJoystickEnabled->isSelected());
     }
     else
     {
@@ -85,7 +85,7 @@ void Setup_Joystick::cancel()
     {
         joystick->setEnabled(mOriginalJoystickEnabled);
     }
-    mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
+    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 }
 
 void Setup_Joystick::apply()
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index ee46396b..fcdb6c51 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -157,7 +157,7 @@ Setup_Video::Setup_Video():
     mFpsField->setEnabled(mFps > 0);
     mFpsSlider->setValue(mFps);
     mFpsSlider->setEnabled(mFps > 0);
-    mFpsCheckBox->setMarked(mFps > 0);
+    mFpsCheckBox->setSelected(mFps > 0);
 
     mCustomCursorCheckBox->setActionEventId("customcursor");
     mAlphaSlider->setActionEventId("guialpha");
@@ -245,7 +245,7 @@ Setup_Video::~Setup_Video()
 void Setup_Video::apply()
 {
     // Full screen changes
-    bool fullscreen = mFsCheckBox->isMarked();
+    bool fullscreen = mFsCheckBox->isSelected();
     if (fullscreen != (config.getValue("screen", 0) == 1))
     {
         // checks for opengl usage
@@ -272,9 +272,9 @@ void Setup_Video::apply()
     }
 
     // OpenGL change
-    if (mOpenGLCheckBox->isMarked() != mOpenGLEnabled)
+    if (mOpenGLCheckBox->isSelected() != mOpenGLEnabled)
     {
-        config.setValue("opengl", mOpenGLCheckBox->isMarked() ? 1 : 0);
+        config.setValue("opengl", mOpenGLCheckBox->isSelected() ? 1 : 0);
 
         // OpenGL can currently only be changed by restarting, notify user.
         new OkDialog(_("Changing OpenGL"),
@@ -315,9 +315,9 @@ Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
 
 void Setup_Video::cancel()
 {
-    mFsCheckBox->setMarked(mFullScreenEnabled);
-    mOpenGLCheckBox->setMarked(mOpenGLEnabled);
-    mCustomCursorCheckBox->setMarked(mCustomCursorEnabled);
+    mFsCheckBox->setSelected(mFullScreenEnabled);
+    mOpenGLCheckBox->setSelected(mOpenGLEnabled);
+    mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
     mAlphaSlider->setValue(mOpacity);
     mOverlayDetailSlider->setValue(mOverlayDetail);
 
@@ -341,7 +341,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     else if (event.getId() == "customcursor")
     {
         config.setValue("customcursor",
-                mCustomCursorCheckBox->isMarked() ? 1 : 0);
+                mCustomCursorCheckBox->isSelected() ? 1 : 0);
     }
     else if (event.getId() == "fpslimitslider")
     {
@@ -379,7 +379,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "fpslimitcheckbox")
     {
-        if (mFpsCheckBox->isMarked())
+        if (mFpsCheckBox->isSelected())
         {
             mFps = (int) mFpsSlider->getValue();
         }
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index e6d3c516..ba77be47 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -23,8 +23,6 @@
 
 #include "shoplistbox.h"
 
-#include "selectionlistener.h"
-
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
@@ -101,37 +99,12 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
     }
 }
 
-void ShopListBox::setSelected(int selected)
-{
-    if (!mListModel)
-    {
-        mSelected = -1;
-    }
-    else
-    {
-        // Update mSelected with bounds checking
-        mSelected = std::min(mListModel->getNumberOfElements() - 1,
-                             std::max(-1, selected));
-
-        gcn::Widget *parent = getParent();
-        if (parent && mSelected >= 0)
-        {
-            gcn::Rectangle scroll;
-            scroll.y = mRowHeight * mSelected;
-            scroll.height = mRowHeight;
-            parent->showWidgetPart(this, scroll);
-        }
-    }
-
-    fireSelectionChangedEvent();
-}
-
 void ShopListBox::mousePressed(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
         setSelected(event.getY() / mRowHeight);
-        generateAction();
+        distributeActionEvent();
     }
 }
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 44a68445..d5e2d836 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -27,8 +27,6 @@
 #include "listbox.h"
 #include "shop.h"
 
-class SelectionListener;
-
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
  * box except this one doesn't have a background, instead completely relying
@@ -54,30 +52,12 @@ class ShopListBox : public ListBox
          */
         void draw(gcn::Graphics *graphics);
 
-        void mousePressed(gcn::MouseEvent &event);
-
         /**
-         * Adds a listener to the list that's notified each time a change to
-         * the selection occurs.
+         * Returns the height of a row.
          */
-        void addSelectionListener(SelectionListener *listener)
-        {
-            mListeners.push_back(listener);
-        }
+        unsigned int getRowHeight() const { return mRowHeight; }
 
-        /**
-         * Removes a listener from the list that's notified each time a change
-         * to the selection occurs.
-         */
-        void removeSelectionListener(SelectionListener *listener)
-        {
-            mListeners.remove(listener);
-        }
-
-        /**
-         * Sets the index of the selected element.
-         */
-        void setSelected(int selected);
+        void mousePressed(gcn::MouseEvent &event);
 
         /**
          * gives information about the current player's money
@@ -104,7 +84,7 @@ class ShopListBox : public ListBox
          */
         ShopItems *mShopItems;
 
-        int mRowHeight; /**< Row Height */
+        unsigned int mRowHeight; /**< Row Height */
 
         bool mPriceCheck;
 };
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index f0170a1b..c94c7bfb 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -64,7 +64,7 @@ Slider::~Slider()
 void Slider::init()
 {
     int x, y, w, h,o1,o2;
-    setBorderSize(0);
+    setFrameSize(0);
 
     // Load resources
     if (mInstances == 0)
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index 8fb2f598..d6267e65 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -82,8 +82,8 @@ void TabbedContainer::logic()
 {
     if (mActiveContent) {
         mActiveContent->setSize(
-                getWidth() - 2 * mActiveContent->getBorderSize(),
-                getHeight() - TABHEIGHT - 2 * mActiveContent->getBorderSize());
+                getWidth() - 2 * mActiveContent->getFrameSize(),
+                getHeight() - TABHEIGHT - 2 * mActiveContent->getFrameSize());
     }
 
     Container::logic();
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 329813e5..84c8ad4b 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -32,14 +32,14 @@ TextBox::TextBox():
     gcn::TextBox()
 {
     setOpaque(false);
-    setBorderSize(0);
+    setFrameSize(0);
 }
 
 TextBox::TextBox(const std::string& text):
     gcn::TextBox(text)
 {
     setOpaque(false);
-    setBorderSize(0);
+    setFrameSize(0);
 }
 
 void TextBox::setText(const std::string &text)
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 11659b8b..4fd85d36 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -44,7 +44,7 @@ ImageRect TextField::skin;
 TextField::TextField(const std::string& text):
     gcn::TextField(text)
 {
-    setBorderSize(2);
+    setFrameSize(2);
 
     if (instances == 0)
     {
@@ -97,10 +97,10 @@ void TextField::draw(gcn::Graphics *graphics)
     graphics->drawText(mText, 1 - mXScroll, 1);
 }
 
-void TextField::drawBorder(gcn::Graphics *graphics)
+void TextField::drawFrame(gcn::Graphics *graphics)
 {
     int w, h, bs;
-    bs = getBorderSize();
+    bs = getFrameSize();
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
@@ -184,7 +184,7 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
         } break;
 
         case Key::ENTER:
-            generateAction();
+            distributeActionEvent();
             break;
 
         case Key::HOME:
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index e36380e3..36f921ac 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -53,7 +53,7 @@ class TextField : public gcn::TextField {
         /**
          * Draws the background and border.
          */
-        void drawBorder(gcn::Graphics *graphics);
+        void drawFrame(gcn::Graphics *graphics);
 
         /**
          * Processes one keypress.
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index bb3d702f..c098c04c 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -147,7 +147,7 @@ void TradeWindow::tradeItem(Item *item, int quantity)
     item->increaseQuantity(-quantity);
 }
 
-void TradeWindow::selectionChanged(const SelectionEvent &event)
+void TradeWindow::valueChanged(const gcn::SelectionEvent &event)
 {
     Item *item;
 
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 449de573..c8ece8d9 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -25,9 +25,9 @@
 #define _TMW_TRADE_H
 
 #include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
 
 #include "window.h"
-#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -41,7 +41,7 @@ class ScrollArea;
  *
  * \ingroup Interface
  */
-class TradeWindow : public Window, gcn::ActionListener, SelectionListener
+class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
 {
     public:
         /**
@@ -84,7 +84,7 @@ class TradeWindow : public Window, gcn::ActionListener, SelectionListener
          * Updates the labels and makes sure only one item is selected in
          * either my inventory or partner inventory.
          */
-        void selectionChanged(const SelectionEvent &event);
+        void valueChanged(const gcn::SelectionEvent &event);
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 6863aa01..b33a55cf 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -42,7 +42,7 @@ DropDown::DropDown(gcn::ListModel *listModel,
                    gcn::DropDown::DropDown(listModel,
                    scrollArea, listBox)
 {
-    setBorderSize(2);
+    setFrameSize(2);
 
     // Initialize graphics
     if (instances == 0)
@@ -103,7 +103,7 @@ void DropDown::draw(gcn::Graphics* graphics)
 
     if (mDroppedDown)
     {
-        h = mOldH;
+        h = mFoldedUpHeight;
     }
     else
     {
@@ -151,19 +151,18 @@ void DropDown::draw(gcn::Graphics* graphics)
     }
 }
 
-void DropDown::drawBorder(gcn::Graphics *graphics)
+void DropDown::drawFrame(gcn::Graphics *graphics)
 {
-    int w, h, bs;
-    bs = getBorderSize();
-    w = getWidth() + bs * 2;
-    h = getHeight() + bs * 2;
+    const int bs = getFrameSize();
+    const int w = getWidth() + bs * 2;
+    const int h = getHeight() + bs * 2;
 
     static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
 
 void DropDown::drawButton(gcn::Graphics *graphics)
 {
-    int height = mDroppedDown ? mOldH : getHeight();
+    int height = mDroppedDown ? mFoldedUpHeight : getHeight();
 
     static_cast<Graphics*>(graphics)->
         drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 37e754af..d0dab7d2 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -64,7 +64,7 @@ class DropDown : public gcn::DropDown
 
         void draw(gcn::Graphics* graphics);
 
-        void drawBorder(gcn::Graphics* graphics);
+        void drawFrame(gcn::Graphics* graphics);
 
 
     protected:
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 7629e2e7..75288eb5 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -106,7 +106,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 
     instances++;
 
-    setBorderSize(0);
+    setFrameSize(0);
     setPadding(3);
     setTitleBarHeight(20);
 
@@ -121,6 +121,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 
     // Windows are invisible by default
     setVisible(false);
+
+    addWidgetListener(this);
 }
 
 Window::~Window()
@@ -202,84 +204,12 @@ void Window::draw(gcn::Graphics *graphics)
     drawChildren(graphics);
 }
 
-void Window::setContentWidth(int width)
-{
-    setWidth(width + 2 * getPadding());
-}
-
-void Window::setContentHeight(int height)
-{
-    setHeight(height + getPadding() + getTitleBarHeight());
-}
-
 void Window::setContentSize(int width, int height)
 {
     setSize(width + 2 * getPadding(),
             height + getPadding() + getTitleBarHeight());
 }
 
-void Window::setSize(int width, int height)
-{
-    if (width == mDimension.width && height == mDimension.height) return;
-
-    // No call to ancestor! Infinite loop otherwise.
-    mDimension.width = width;
-    mDimension.height = height;
-
-    if (mGrip)
-    {
-        gcn::Rectangle const &area = getChildrenArea();
-        mGrip->setPosition(width - mGrip->getWidth() - area.x,
-                           height - mGrip->getHeight() - area.y);
-    }
-
-    if (mLayout)
-    {
-        int w = width - 2 * getPadding(),
-            h = height - getPadding() - getTitleBarHeight();
-        mLayout->reflow(w, h);
-    }
-
-    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_RESIZED));
-}
-
-void Window::setWidth(int width)
-{
-    setSize(width, mDimension.height);
-}
-
-void Window::setHeight(int height)
-{
-    setSize(mDimension.width, height);
-}
-
-void Window::setPosition(int x, int y)
-{
-    if (x == mDimension.x && y == mDimension.y) return;
-
-    // No call to ancestor!
-    mDimension.x = x;
-    mDimension.y = y;
-
-    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_MOVED));
-}
-
-void Window::setDimension(const gcn::Rectangle &dimension)
-{
-    setPosition(dimension.x, dimension.y);
-    setSize(dimension.width, dimension.height);
-}
-
-void Window::setX(int x)
-{
-    setPosition(x, mDimension.y);
-}
-
-void Window::setY(int y)
-{
-    setPosition(mDimension.x, y);
-}
-
 void Window::setLocationRelativeTo(gcn::Widget *widget)
 {
     int wx, wy;
@@ -331,6 +261,23 @@ void Window::setResizable(bool r)
     }
 }
 
+void Window::widgetResized(const gcn::Event &event)
+{
+    if (mGrip)
+    {
+        gcn::Rectangle const &area = getChildrenArea();
+        mGrip->setPosition(getWidth() - mGrip->getWidth() - area.x,
+                           getHeight() - mGrip->getHeight() - area.y);
+    }
+
+    if (mLayout)
+    {
+        int w = getWidth() - 2 * getPadding();
+        int h = getHeight() - getPadding() - getTitleBarHeight();
+        mLayout->reflow(w, h);
+    }
+}
+
 void Window::setCloseButton(bool flag)
 {
     mCloseButton = flag;
@@ -407,7 +354,7 @@ void Window::mouseReleased(gcn::MouseEvent &event)
     }
 
     // This should be the responsibility of Guichan (and is from 0.8.0 on)
-    mIsMoving = false;
+    mMoved = false;
 }
 
 void Window::mouseExited(gcn::MouseEvent &event)
@@ -449,7 +396,7 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     gcn::Window::mouseDragged(event);
 
     // Keep guichan window inside screen when it may be moved
-    if (isMovable() && mIsMoving)
+    if (isMovable() && mMoved)
     {
         int newX = std::max(0, getX());
         int newY = std::max(0, getY());
@@ -458,7 +405,7 @@ void Window::mouseDragged(gcn::MouseEvent &event)
         setPosition(newX, newY);
     }
 
-    if (mouseResize && !mIsMoving)
+    if (mouseResize && !mMoved)
     {
         const int dx = event.getX() - mDragOffsetX;
         const int dy = event.getY() - mDragOffsetY;
@@ -585,24 +532,6 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
     return resizeHandles;
 }
 
-void Window::fireWindowEvent(const WindowEvent &event)
-{
-    WindowListeners::iterator i_end = mListeners.end();
-    WindowListeners::iterator i = mListeners.begin();
-
-    switch (event.getType())
-    {
-        case WindowEvent::WINDOW_MOVED:
-            for (; i != i_end; ++i)
-            { (*i)->windowMoved(event); }
-            break;
-        case WindowEvent::WINDOW_RESIZED:
-            for (; i != i_end; ++i)
-            { (*i)->windowResized(event); }
-            break;
-    }
-}
-
 Layout &Window::getLayout()
 {
     if (!mLayout) mLayout = new Layout;
diff --git a/src/gui/window.h b/src/gui/window.h
index df756be3..9f5969f0 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -25,11 +25,10 @@
 #define _TMW_WINDOW_H__
 
 #include <guichan/widgets/window.hpp>
+#include <guichan/widgetlistener.hpp>
 
 #include "../guichanfwd.h"
 
-#include "windowlistener.h"
-
 class ConfigListener;
 class ContainerPlacer;
 class Image;
@@ -45,7 +44,7 @@ class WindowContainer;
  *
  * \ingroup GUI
  */
-class Window : public gcn::Window
+class Window : public gcn::Window, gcn::WidgetListener
 {
     public:
         friend class WindowConfigListener;
@@ -78,56 +77,11 @@ class Window : public gcn::Window
          */
         void draw(gcn::Graphics *graphics);
 
-        /**
-         * Sets the width of the window contents.
-         */
-        void setContentWidth(int width);
-
-        /**
-         * Sets the height of the window contents.
-         */
-        void setContentHeight(int height);
-
         /**
          * Sets the size of this window.
          */
         void setContentSize(int width, int height);
 
-        /**
-         * Sets the size of this window.
-         */
-        void setSize(int width, int height);
-
-        /**
-         * Sets the width of this window.
-         */
-        void setWidth(int width);
-
-        /**
-         * Sets the height of this window.
-         */
-        void setHeight(int height);
-
-        /**
-         * Sets the position and size of this window.
-         */
-        void setDimension(const gcn::Rectangle &dimension);
-
-        /**
-         * Sets the position of this window.
-         */
-        void setPosition(int x, int y);
-
-        /**
-         * Sets the window x coordinate.
-         */
-        void setX(int x);
-
-        /**
-         * Sets the window y coordinate.
-         */
-        void setY(int y);
-
         /**
          * Sets the location relative to the given widget.
          */
@@ -138,6 +92,11 @@ class Window : public gcn::Window
          */
         void setResizable(bool resize);
 
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
         /**
          * Sets whether or not the window has a close button.
          */
@@ -256,20 +215,6 @@ class Window : public gcn::Window
          */
         void resetToDefaultSize();
 
-        /**
-         * Adds a listener to the list that's notified when the window is
-         * moved or resized.
-         */
-        void addWindowListener(WindowListener *listener)
-        { mListeners.push_back(listener); }
-
-        /**
-         * Removes a listener from the list that's notified when the window is
-         * moved or resized.
-         */
-        void removeWindowListener(WindowListener *listener)
-        { mListeners.remove(listener); }
-
         enum ResizeHandles
         {
             TOP    = 0x01,
@@ -349,14 +294,6 @@ class Window : public gcn::Window
          * where two borders are moved at the same time.
          */
         static const int resizeBorderWidth = 10;
-
-    private:
-        /**
-         * Sends out a window event to the list of selection listeners.
-         */
-        void fireWindowEvent(const WindowEvent &event);
-
-        WindowListeners mListeners;
 };
 
 #endif
diff --git a/src/gui/windowlistener.h b/src/gui/windowlistener.h
deleted file mode 100644
index 24f6a7b8..00000000
--- a/src/gui/windowlistener.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  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$
- */
-
-#ifndef _TMW_WINDOW_LISTENER_H_
-#define _TMW_WINDOW_LISTENER_H_
-
-#include <guichan/widgets/window.hpp>
-#include <guichan/event.hpp>
-
-/**
- * An event that characterizes a window move or resize.
- *
- * \ingroup GUI
- */
-class WindowEvent : public gcn::Event
-{
-    public:
-        /**
-         * Constructor.
-         */
-        WindowEvent(gcn::Window *source, int type):
-            gcn::Event(source)
-        {
-            mType = type;
-        }
-
-        /**
-         * Returns the event type.
-         */
-        int getType() const
-        { return mType; }
-
-        enum WindowEventType
-        {
-            WINDOW_MOVED,
-            WINDOW_RESIZED
-        };
-};
-
-/**
- * The listener that's notified when a window is moved or resized.
- *
- * \ingroup GUI
- */
-class WindowListener
-{
-    public:
-        /**
-         * Virtual destructor.
-         */
-        virtual ~WindowListener() {}
-
-        /**
-         * Called whenever the window is moved.
-         */
-        virtual void windowMoved(const WindowEvent &) {}
-
-        /**
-         * Called whenever the window is resized.
-         */
-        virtual void windowResized(const WindowEvent &) {}
-};
-
-typedef std::list<WindowListener*> WindowListeners;
-
-#endif
-- 
cgit v1.2.3-60-g2f50


From ff61662640c4053220464f34413568f06f51154a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 16 Nov 2008 15:37:13 +0100
Subject: Got rid of CVS/Subversion $Id$ markers

I don't know why we dealt with these things for so long. Did we ever get
anything out of it?
---
 src/animatedsprite.cpp                  | 2 --
 src/animatedsprite.h                    | 2 --
 src/animationparticle.cpp               | 1 -
 src/animationparticle.h                 | 1 -
 src/being.cpp                           | 2 --
 src/being.h                             | 2 --
 src/beingmanager.cpp                    | 2 --
 src/beingmanager.h                      | 2 --
 src/channel.cpp                         | 2 --
 src/channel.h                           | 2 --
 src/channelmanager.cpp                  | 2 --
 src/channelmanager.h                    | 2 --
 src/commandhandler.cpp                  | 2 --
 src/commandhandler.h                    | 2 --
 src/configlistener.h                    | 2 --
 src/configuration.cpp                   | 2 --
 src/configuration.h                     | 2 --
 src/effectmanager.cpp                   | 1 -
 src/effectmanager.h                     | 1 -
 src/engine.cpp                          | 2 --
 src/engine.h                            | 2 --
 src/equipment.cpp                       | 2 --
 src/equipment.h                         | 2 --
 src/floor_item.cpp                      | 2 --
 src/floor_item.h                        | 2 --
 src/flooritemmanager.cpp                | 2 --
 src/flooritemmanager.h                  | 2 --
 src/game.cpp                            | 2 --
 src/game.h                              | 2 --
 src/graphics.cpp                        | 2 --
 src/graphics.h                          | 2 --
 src/gui/box.cpp                         | 2 --
 src/gui/box.h                           | 2 --
 src/gui/browserbox.cpp                  | 2 --
 src/gui/browserbox.h                    | 2 --
 src/gui/buddywindow.cpp                 | 2 --
 src/gui/buddywindow.h                   | 2 --
 src/gui/button.cpp                      | 2 --
 src/gui/button.h                        | 2 --
 src/gui/buy.cpp                         | 2 --
 src/gui/buy.h                           | 2 --
 src/gui/buysell.cpp                     | 2 --
 src/gui/buysell.h                       | 2 --
 src/gui/changeemaildialog.cpp           | 2 --
 src/gui/changeemaildialog.h             | 2 --
 src/gui/changepassworddialog.cpp        | 2 --
 src/gui/changepassworddialog.h          | 2 --
 src/gui/char_select.cpp                 | 2 --
 src/gui/char_select.h                   | 2 --
 src/gui/chargedialog.cpp                | 1 -
 src/gui/chargedialog.h                  | 1 -
 src/gui/chat.cpp                        | 2 --
 src/gui/chat.h                          | 2 --
 src/gui/chatinput.cpp                   | 2 --
 src/gui/chatinput.h                     | 2 --
 src/gui/checkbox.cpp                    | 2 --
 src/gui/checkbox.h                      | 2 --
 src/gui/confirm_dialog.cpp              | 2 --
 src/gui/confirm_dialog.h                | 2 --
 src/gui/connection.cpp                  | 2 --
 src/gui/connection.h                    | 2 --
 src/gui/debugwindow.cpp                 | 2 --
 src/gui/debugwindow.h                   | 2 --
 src/gui/equipmentwindow.cpp             | 2 --
 src/gui/equipmentwindow.h               | 2 --
 src/gui/focushandler.cpp                | 2 --
 src/gui/focushandler.h                  | 2 --
 src/gui/gccontainer.cpp                 | 2 --
 src/gui/gccontainer.h                   | 2 --
 src/gui/gui.cpp                         | 2 --
 src/gui/gui.h                           | 2 --
 src/gui/guildlistbox.cpp                | 2 --
 src/gui/guildlistbox.h                  | 2 --
 src/gui/guildwindow.cpp                 | 1 -
 src/gui/guildwindow.h                   | 2 --
 src/gui/hbox.cpp                        | 2 --
 src/gui/hbox.h                          | 2 --
 src/gui/help.cpp                        | 2 --
 src/gui/help.h                          | 2 --
 src/gui/icon.cpp                        | 2 --
 src/gui/icon.h                          | 2 --
 src/gui/inttextbox.cpp                  | 2 --
 src/gui/inttextbox.h                    | 2 --
 src/gui/inventorywindow.cpp             | 2 --
 src/gui/inventorywindow.h               | 2 --
 src/gui/item_amount.cpp                 | 2 --
 src/gui/item_amount.h                   | 2 --
 src/gui/itemcontainer.cpp               | 2 --
 src/gui/itemcontainer.h                 | 2 --
 src/gui/itempopup.cpp                   | 2 --
 src/gui/itempopup.h                     | 3 ---
 src/gui/itemshortcutcontainer.cpp       | 2 --
 src/gui/itemshortcutcontainer.h         | 2 --
 src/gui/itemshortcutwindow.cpp          | 2 --
 src/gui/itemshortcutwindow.h            | 2 --
 src/gui/linkhandler.h                   | 2 --
 src/gui/listbox.cpp                     | 2 --
 src/gui/listbox.h                       | 2 --
 src/gui/login.cpp                       | 2 --
 src/gui/login.h                         | 2 --
 src/gui/magic.cpp                       | 2 --
 src/gui/magic.h                         | 3 ---
 src/gui/menuwindow.cpp                  | 2 --
 src/gui/menuwindow.h                    | 2 --
 src/gui/minimap.cpp                     | 2 --
 src/gui/minimap.h                       | 2 --
 src/gui/ministatus.cpp                  | 2 --
 src/gui/ministatus.h                    | 2 --
 src/gui/newskill.cpp                    | 2 --
 src/gui/newskill.h                      | 2 --
 src/gui/npc_text.cpp                    | 2 --
 src/gui/npc_text.h                      | 2 --
 src/gui/npclistdialog.cpp               | 2 --
 src/gui/npclistdialog.h                 | 2 --
 src/gui/npcpostdialog.cpp               | 2 --
 src/gui/npcpostdialog.h                 | 2 --
 src/gui/ok_dialog.cpp                   | 2 --
 src/gui/ok_dialog.h                     | 2 --
 src/gui/partywindow.cpp                 | 2 --
 src/gui/partywindow.h                   | 2 --
 src/gui/passwordfield.cpp               | 2 --
 src/gui/passwordfield.h                 | 2 --
 src/gui/playerbox.cpp                   | 2 --
 src/gui/playerbox.h                     | 2 --
 src/gui/popupmenu.cpp                   | 2 --
 src/gui/popupmenu.h                     | 2 --
 src/gui/progressbar.cpp                 | 2 --
 src/gui/progressbar.h                   | 2 --
 src/gui/quitdialog.cpp                  | 1 -
 src/gui/quitdialog.h                    | 1 -
 src/gui/radiobutton.cpp                 | 2 --
 src/gui/radiobutton.h                   | 2 --
 src/gui/register.cpp                    | 2 --
 src/gui/register.h                      | 2 --
 src/gui/scrollarea.cpp                  | 2 --
 src/gui/scrollarea.h                    | 2 --
 src/gui/sdlinput.cpp                    | 2 --
 src/gui/sdlinput.h                      | 2 --
 src/gui/sell.cpp                        | 2 --
 src/gui/sell.h                          | 2 --
 src/gui/serverdialog.cpp                | 2 --
 src/gui/serverdialog.h                  | 2 --
 src/gui/setup.cpp                       | 2 --
 src/gui/setup.h                         | 2 --
 src/gui/setup_audio.cpp                 | 2 --
 src/gui/setup_audio.h                   | 2 --
 src/gui/setup_joystick.cpp              | 2 --
 src/gui/setup_joystick.h                | 2 --
 src/gui/setup_keyboard.cpp              | 2 --
 src/gui/setup_keyboard.h                | 2 --
 src/gui/setup_video.cpp                 | 2 --
 src/gui/setup_video.h                   | 2 --
 src/gui/setuptab.h                      | 2 --
 src/gui/shop.cpp                        | 2 --
 src/gui/shop.h                          | 2 --
 src/gui/shoplistbox.cpp                 | 2 --
 src/gui/shoplistbox.h                   | 2 --
 src/gui/skill.cpp                       | 2 --
 src/gui/skill.h                         | 2 --
 src/gui/slider.cpp                      | 2 --
 src/gui/slider.h                        | 2 --
 src/gui/speechbubble.cpp                | 2 --
 src/gui/speechbubble.h                  | 2 --
 src/gui/status.cpp                      | 2 --
 src/gui/status.h                        | 2 --
 src/gui/textbox.cpp                     | 2 --
 src/gui/textbox.h                       | 2 --
 src/gui/textdialog.cpp                  | 2 --
 src/gui/textdialog.h                    | 2 --
 src/gui/textfield.cpp                   | 2 --
 src/gui/textfield.h                     | 2 --
 src/gui/trade.cpp                       | 2 --
 src/gui/trade.h                         | 2 --
 src/gui/truetypefont.cpp                | 2 --
 src/gui/truetypefont.h                  | 2 --
 src/gui/unregisterdialog.cpp            | 2 --
 src/gui/unregisterdialog.h              | 2 --
 src/gui/updatewindow.cpp                | 2 --
 src/gui/updatewindow.h                  | 2 --
 src/gui/vbox.cpp                        | 2 --
 src/gui/vbox.h                          | 2 --
 src/gui/viewport.cpp                    | 2 --
 src/gui/viewport.h                      | 2 --
 src/gui/widgets/avatar.cpp              | 2 --
 src/gui/widgets/avatar.h                | 2 --
 src/gui/widgets/dropdown.cpp            | 2 --
 src/gui/widgets/dropdown.h              | 2 --
 src/gui/widgets/layout.cpp              | 2 --
 src/gui/widgets/layout.h                | 2 --
 src/gui/widgets/resizegrip.cpp          | 2 --
 src/gui/widgets/resizegrip.h            | 2 --
 src/gui/widgets/tab.cpp                 | 2 --
 src/gui/widgets/tab.h                   | 2 --
 src/gui/widgets/tabbedarea.cpp          | 2 --
 src/gui/widgets/tabbedarea.h            | 2 --
 src/gui/window.cpp                      | 2 --
 src/gui/window.h                        | 2 --
 src/gui/windowcontainer.cpp             | 2 --
 src/gui/windowcontainer.h               | 2 --
 src/guichanfwd.h                        | 2 --
 src/guild.cpp                           | 2 --
 src/guild.h                             | 2 --
 src/imageparticle.cpp                   | 2 --
 src/imageparticle.h                     | 2 --
 src/inventory.cpp                       | 2 --
 src/inventory.h                         | 2 --
 src/item.cpp                            | 2 --
 src/item.h                              | 2 --
 src/itemshortcut.cpp                    | 2 --
 src/itemshortcut.h                      | 2 --
 src/joystick.cpp                        | 2 --
 src/joystick.h                          | 2 --
 src/keyboardconfig.cpp                  | 2 --
 src/keyboardconfig.h                    | 2 --
 src/localplayer.cpp                     | 2 --
 src/localplayer.h                       | 2 --
 src/lockedarray.h                       | 2 --
 src/logindata.h                         | 2 --
 src/main.cpp                            | 2 --
 src/main.h                              | 2 --
 src/map.cpp                             | 2 --
 src/map.h                               | 2 --
 src/monster.cpp                         | 2 --
 src/monster.h                           | 2 --
 src/net/accountserver/account.cpp       | 2 --
 src/net/accountserver/account.h         | 2 --
 src/net/accountserver/accountserver.cpp | 2 --
 src/net/accountserver/accountserver.h   | 2 --
 src/net/accountserver/internal.cpp      | 2 --
 src/net/accountserver/internal.h        | 2 --
 src/net/beinghandler.cpp                | 2 --
 src/net/beinghandler.h                  | 2 --
 src/net/buysellhandler.cpp              | 2 --
 src/net/buysellhandler.h                | 2 --
 src/net/charserverhandler.cpp           | 2 --
 src/net/charserverhandler.h             | 2 --
 src/net/chathandler.cpp                 | 2 --
 src/net/chathandler.h                   | 2 --
 src/net/chatserver/chatserver.cpp       | 2 --
 src/net/chatserver/chatserver.h         | 2 --
 src/net/chatserver/guild.cpp            | 2 --
 src/net/chatserver/guild.h              | 2 --
 src/net/chatserver/internal.cpp         | 2 --
 src/net/chatserver/internal.h           | 2 --
 src/net/chatserver/party.cpp            | 2 --
 src/net/chatserver/party.h              | 2 --
 src/net/connection.cpp                  | 2 --
 src/net/connection.h                    | 2 --
 src/net/effecthandler.cpp               | 1 -
 src/net/effecthandler.h                 | 1 -
 src/net/gameserver/gameserver.cpp       | 2 --
 src/net/gameserver/gameserver.h         | 2 --
 src/net/gameserver/internal.cpp         | 2 --
 src/net/gameserver/internal.h           | 2 --
 src/net/gameserver/player.cpp           | 2 --
 src/net/gameserver/player.h             | 2 --
 src/net/guildhandler.cpp                | 2 --
 src/net/guildhandler.h                  | 2 --
 src/net/internal.cpp                    | 2 --
 src/net/internal.h                      | 2 --
 src/net/inventoryhandler.cpp            | 2 --
 src/net/inventoryhandler.h              | 2 --
 src/net/itemhandler.cpp                 | 2 --
 src/net/itemhandler.h                   | 2 --
 src/net/loginhandler.cpp                | 2 --
 src/net/loginhandler.h                  | 2 --
 src/net/logouthandler.cpp               | 2 --
 src/net/logouthandler.h                 | 2 --
 src/net/messagehandler.cpp              | 2 --
 src/net/messagehandler.h                | 2 --
 src/net/messagein.cpp                   | 2 --
 src/net/messagein.h                     | 2 --
 src/net/messageout.cpp                  | 2 --
 src/net/messageout.h                    | 2 --
 src/net/network.cpp                     | 2 --
 src/net/network.h                       | 2 --
 src/net/npchandler.cpp                  | 2 --
 src/net/npchandler.h                    | 2 --
 src/net/partyhandler.cpp                | 2 --
 src/net/partyhandler.h                  | 2 --
 src/net/playerhandler.cpp               | 2 --
 src/net/playerhandler.h                 | 2 --
 src/net/protocol.h                      | 2 --
 src/net/tradehandler.cpp                | 2 --
 src/net/tradehandler.h                  | 2 --
 src/npc.cpp                             | 2 --
 src/npc.h                               | 2 --
 src/openglgraphics.cpp                  | 2 --
 src/openglgraphics.h                    | 2 --
 src/particle.cpp                        | 2 --
 src/particle.h                          | 2 --
 src/particleemitter.cpp                 | 2 --
 src/particleemitter.h                   | 2 --
 src/player.cpp                          | 2 --
 src/player.h                            | 2 --
 src/position.cpp                        | 2 --
 src/position.h                          | 2 --
 src/properties.h                        | 2 --
 src/resources/action.cpp                | 2 --
 src/resources/action.h                  | 2 --
 src/resources/ambientoverlay.cpp        | 2 --
 src/resources/ambientoverlay.h          | 2 --
 src/resources/animation.cpp             | 2 --
 src/resources/animation.h               | 2 --
 src/resources/buddylist.cpp             | 2 --
 src/resources/buddylist.h               | 2 --
 src/resources/dye.cpp                   | 2 --
 src/resources/dye.h                     | 2 --
 src/resources/image.cpp                 | 2 --
 src/resources/image.h                   | 2 --
 src/resources/imageloader.cpp           | 2 --
 src/resources/imageloader.h             | 2 --
 src/resources/imageset.cpp              | 2 --
 src/resources/imageset.h                | 2 --
 src/resources/imagewriter.cpp           | 2 --
 src/resources/imagewriter.h             | 2 --
 src/resources/itemdb.cpp                | 2 --
 src/resources/itemdb.h                  | 2 --
 src/resources/iteminfo.cpp              | 2 --
 src/resources/iteminfo.h                | 2 --
 src/resources/mapreader.cpp             | 2 --
 src/resources/mapreader.h               | 2 --
 src/resources/monsterdb.cpp             | 2 --
 src/resources/monsterdb.h               | 2 --
 src/resources/monsterinfo.cpp           | 2 --
 src/resources/monsterinfo.h             | 2 --
 src/resources/music.cpp                 | 2 --
 src/resources/music.h                   | 2 --
 src/resources/npcdb.cpp                 | 2 --
 src/resources/npcdb.h                   | 2 --
 src/resources/resource.cpp              | 2 --
 src/resources/resource.h                | 2 --
 src/resources/resourcemanager.cpp       | 2 --
 src/resources/resourcemanager.h         | 2 --
 src/resources/soundeffect.cpp           | 2 --
 src/resources/soundeffect.h             | 2 --
 src/resources/spritedef.cpp             | 2 --
 src/resources/spritedef.h               | 2 --
 src/serverinfo.h                        | 2 --
 src/shopitem.cpp                        | 2 --
 src/shopitem.h                          | 2 --
 src/simpleanimation.cpp                 | 2 --
 src/simpleanimation.h                   | 2 --
 src/sound.cpp                           | 2 --
 src/sound.h                             | 2 --
 src/sprite.h                            | 2 --
 src/textparticle.cpp                    | 2 --
 src/textparticle.h                      | 2 --
 src/tileset.h                           | 2 --
 src/utils/base64.cpp                    | 1 -
 src/utils/base64.h                      | 1 -
 src/utils/dtor.h                        | 2 --
 src/utils/fastsqrt.h                    | 2 --
 src/utils/gettext.h                     | 2 --
 src/utils/minmax.h                      | 2 --
 src/utils/sha256.cpp                    | 2 --
 src/utils/sha256.h                      | 2 --
 src/utils/strprintf.cpp                 | 2 --
 src/utils/strprintf.h                   | 2 --
 src/utils/tostring.h                    | 2 --
 src/utils/trim.h                        | 2 --
 src/utils/xml.cpp                       | 2 --
 src/utils/xml.h                         | 2 --
 src/vector.cpp                          | 2 --
 src/vector.h                            | 2 --
 tools/dyecmd/src/dye.cpp                | 2 --
 tools/dyecmd/src/dye.h                  | 2 --
 tools/dyecmd/src/dyecmd.cpp             | 2 --
 tools/dyecmd/src/imagewriter.cpp        | 2 --
 tools/dyecmd/src/imagewriter.h          | 2 --
 tools/tmxcopy/base64.cpp                | 1 -
 tools/tmxcopy/base64.h                  | 1 -
 tools/tmxcopy/tostring.h                | 2 --
 tools/tmxcopy/xmlutils.cpp              | 1 -
 tools/tmxcopy/xmlutils.h                | 1 -
 375 files changed, 735 deletions(-)

(limited to 'src/gui/quitdialog.cpp')

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 13596a70..b2bb1f28 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.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$
  */
 
 #include "animatedsprite.h"
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index a1fbe7a0..405bf42e 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.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$
  */
 
 #ifndef _TMW_ANIMATEDSPRITE_H
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index c79a5bc4..eb260157 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -17,7 +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
- *
  */
 
 #include "animationparticle.h"
diff --git a/src/animationparticle.h b/src/animationparticle.h
index 054b1b73..eabc2742 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -17,7 +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
- *
  */
 
 #ifndef _ANIMATION_PARTICLE
diff --git a/src/being.cpp b/src/being.cpp
index bac66d48..a267d033 100644
--- a/src/being.cpp
+++ b/src/being.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$
  */
 #include "being.h"
 
diff --git a/src/being.h b/src/being.h
index a0475910..bf11e3ed 100644
--- a/src/being.h
+++ b/src/being.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$
  */
 
 #ifndef _TMW_BEING_H
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 40f438df..6d9267d2 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.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$
  */
 
 #include <cassert>
diff --git a/src/beingmanager.h b/src/beingmanager.h
index f7a3b8f0..d3fb9888 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.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$
  */
 
 #ifndef _TMW_BEINGMANAGER_H
diff --git a/src/channel.cpp b/src/channel.cpp
index 969386f1..c62d6590 100644
--- a/src/channel.cpp
+++ b/src/channel.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$
  */
 
 
diff --git a/src/channel.h b/src/channel.h
index 3cb38a1c..01bd2728 100644
--- a/src/channel.h
+++ b/src/channel.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$
  */
 
 #include <string>
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
index 3c66f4bb..a332edbb 100644
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.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$
  */
 
 #include <list>
diff --git a/src/channelmanager.h b/src/channelmanager.h
index 5e6b5ba1..c19c548a 100644
--- a/src/channelmanager.h
+++ b/src/channelmanager.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$
  */
 
 #ifndef _TMW_CHANNELMANAGER_H
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 5c7b5e52..4b1a0225 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.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$
  */
 
 
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 10a4376f..eab0f077 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.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$
  */
 
 #ifndef _TMW_COMMANDHANDLER_H
diff --git a/src/configlistener.h b/src/configlistener.h
index 7ce5d949..b740720f 100644
--- a/src/configlistener.h
+++ b/src/configlistener.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$
  */
 
 #ifndef _TMW_CONFIGLISTENER_H
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 864ad7c3..e801083f 100644
--- a/src/configuration.cpp
+++ b/src/configuration.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$
  */
 
 
diff --git a/src/configuration.h b/src/configuration.h
index 28246a02..a2d3b55d 100644
--- a/src/configuration.h
+++ b/src/configuration.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$
  */
 
 #ifndef _TMW_CONFIGURATION_H
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 87d98834..52f1eb31 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -17,7 +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
- *
  */
 
 #include "effectmanager.h"
diff --git a/src/effectmanager.h b/src/effectmanager.h
index b5451f27..1ae82caf 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -17,7 +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
- *
  */
 
 #ifndef _EFFECT_MANAGER_H
diff --git a/src/engine.cpp b/src/engine.cpp
index e4b25c02..ba5ce5e3 100644
--- a/src/engine.cpp
+++ b/src/engine.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$
  */
 
 #include "engine.h"
diff --git a/src/engine.h b/src/engine.h
index 0e77bf3d..dbee1258 100644
--- a/src/engine.h
+++ b/src/engine.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$
  */
 
 #ifndef _ENGINE_H
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 265f230a..aa56b791 100644
--- a/src/equipment.cpp
+++ b/src/equipment.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$
  */
 
 #include <algorithm>
diff --git a/src/equipment.h b/src/equipment.h
index 7a0c8238..736074dd 100644
--- a/src/equipment.h
+++ b/src/equipment.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$
  */
 
 #ifndef _TMW_EQUIPMENT_H_
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 9727093f..7ad3c0c0 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.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$
  */
 
 #include "floor_item.h"
diff --git a/src/floor_item.h b/src/floor_item.h
index a87e3f79..b747310b 100644
--- a/src/floor_item.h
+++ b/src/floor_item.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$
  */
 
 #ifndef _TMW_FLOORITEM_H_
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index c28755fb..68c84b5b 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.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$
  */
 
 #include "flooritemmanager.h"
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index c12883a4..3dbaf988 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.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$
  */
 
 #ifndef _TMW_FLOORITEMMANAGER_H
diff --git a/src/game.cpp b/src/game.cpp
index 421c8aac..df6d5578 100644
--- a/src/game.cpp
+++ b/src/game.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$
  */
 
 #include "game.h"
diff --git a/src/game.h b/src/game.h
index 56923bd0..4035584b 100644
--- a/src/game.h
+++ b/src/game.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$
  */
 
 #ifndef _TMW_GAME_
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 586f9f49..6920bcb0 100644
--- a/src/graphics.cpp
+++ b/src/graphics.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$
  */
 
 #include <cassert>
diff --git a/src/graphics.h b/src/graphics.h
index 564826a2..efdd1ac1 100644
--- a/src/graphics.h
+++ b/src/graphics.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$
  */
 
 #ifndef _GRAPHICS_H
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
index 6af3ae3e..59d8c135 100644
--- a/src/gui/box.cpp
+++ b/src/gui/box.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$
  */
 
 #include "box.h"
diff --git a/src/gui/box.h b/src/gui/box.h
index ed1a7163..46654b48 100644
--- a/src/gui/box.h
+++ b/src/gui/box.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$
  */
 
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 53a2ac0f..b0b6f48e 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 0a9032e4..465ff497 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.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$
  */
 
 #ifndef __TMW_BROWSERBOX_H__
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 0ed383ce..14a941a5 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.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$
  */
 
 #include "buddywindow.h"
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index a3ca4de2..6b07f470 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.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$
  */
 
 #ifndef _TMW_BUDDYWINDOW_H
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index c6bc4ccb..40ecd1b7 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/button.h b/src/gui/button.h
index d12173b2..f451416c 100644
--- a/src/gui/button.h
+++ b/src/gui/button.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$
  */
 
 #ifndef _TMW_BUTTON_H
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 49d19675..a948b136 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.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$
  */
 
 #include "buy.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index ec7419be..24f18742 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.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$
  */
 
 #ifndef _TMW_BUY_H
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index ae5c7358..42380882 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.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$
  */
 
 #include "buysell.h"
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 97caf34b..2391ed1c 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.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$
  */
 
 #ifndef _TMW_BUYSELL_H
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index 94253d31..c9bc2570 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.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$
  */
 
 #include "changeemaildialog.h"
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 862c9d10..8ec3705d 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.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$
  */
 
 #ifndef _TMW_GUI_CHANGEEMAIL_H
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index e3bb0511..8d667790 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.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$
  */
 
 #include "changepassworddialog.h"
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 450cce61..0cf744da 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.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$
  */
 
 #ifndef _TMW_CHANGEPASSWORDDIALOG_H
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index c011aa84..3adfbc08 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.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$
  */
 
 #include "char_select.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 0c1dbe45..ed03cedd 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.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$
  */
 
 #ifndef _CHAR_SELECT_H
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 862378ae..1c9edf45 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -17,7 +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
- *
  */
 
  /* The window supported by this class shows player stats and keeps a charging
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index c09c692c..9517ef6a 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -17,7 +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
- *
  */
 
 #ifndef _TMW_CHARGE_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 82e7d372..c94429c8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/chat.h b/src/gui/chat.h
index f7af6480..a41b11fb 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.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$
  */
 
 #ifndef _TMW_CHAT_H
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index fc5d6aab..afe7f037 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.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$
  */
 
 #include "chatinput.h"
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index da2342ae..e04dfa6e 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.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$
  */
 
 #ifndef _TMW_CHATINPUT_H
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 5b300d33..20e24dee 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.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$
  */
 
 #include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 262e63ae..839ca97e 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.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$
  */
 
 #ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 65ca27f7..5f2b9cb2 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.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$
  */
 
 #include "confirm_dialog.h"
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 8728f83f..c9bfca02 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.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$
  */
 
 #ifndef _TMW_OPTION_DIALOG_H
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index a9fa2a56..f54c9dd5 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.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$
  */
 
 #include "connection.h"
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 51ad5467..36ccd8a9 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.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$
  */
 
 #ifndef _TMW_CONNECTION_H
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 3d0690b9..d92c3575 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.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$
  */
 
 #include "debugwindow.h"
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 9b6f2017..ae1d8b14 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.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$
  */
 
 #ifndef _TMW_DEBUGWINDOW_H
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 9a96b4d6..aee262d0 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.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$
  */
 
 #define BOX_WIDTH 36
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 696f4fc6..b6d2e2f4 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.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$
  */
 
 #ifndef _TMW_EQUIPMENT_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index ffdb7896..1bda568e 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.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$
  */
 
 #include "focushandler.h"
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 252fdd9d..a5218485 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.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$
  */
 
 #ifndef _TMW_FOCUSHANDLER_H
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 1edb4daf..ec3c8a5c 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.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$
  */
 
 #include "gccontainer.h"
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 8b8a7ffe..cc7c9336 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.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$
  */
 
 #ifndef _TMW_GUI_GCCONTAINER_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index bc2f017b..6803be65 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.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$
  */
 
 #include "gui.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 84f52a31..a07d236f 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.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$
  */
 
 #ifndef _TMW_GUI
diff --git a/src/gui/guildlistbox.cpp b/src/gui/guildlistbox.cpp
index 5fe62fe5..556df3fe 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/guildlistbox.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 $
  */
 
 #include "guildlistbox.h"
diff --git a/src/gui/guildlistbox.h b/src/gui/guildlistbox.h
index b3892955..cc8e3ce7 100644
--- a/src/gui/guildlistbox.h
+++ b/src/gui/guildlistbox.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 $
  */
 
 #ifndef _TMW_GUI_GUILDLISTBOX_H
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 3319489c..ae9684df 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -17,7 +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
- *
  *  $$
  */
 
diff --git a/src/gui/guildwindow.h b/src/gui/guildwindow.h
index e1bd99d7..4f6b9cbb 100644
--- a/src/gui/guildwindow.h
+++ b/src/gui/guildwindow.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$
  */
 
 #ifndef _TMW_GUI_GUILDWINDOW_H
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
index 69564fbb..020e85c6 100644
--- a/src/gui/hbox.cpp
+++ b/src/gui/hbox.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$
  */
 
 #include "hbox.h"
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 560b1a29..4b241383 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.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$
  */
 
 #ifndef HBOX_H
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 87de1e2f..ffe9c02d 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.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$
  */
 
 #include "help.h"
diff --git a/src/gui/help.h b/src/gui/help.h
index 3c3715a0..053df723 100644
--- a/src/gui/help.h
+++ b/src/gui/help.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$
  */
 
 #ifndef _TMW_HELP_H
diff --git a/src/gui/icon.cpp b/src/gui/icon.cpp
index 58b3ae8a..1e352292 100644
--- a/src/gui/icon.cpp
+++ b/src/gui/icon.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$
  */
 
 #include "icon.h"
diff --git a/src/gui/icon.h b/src/gui/icon.h
index f0d3a70a..9baf1a99 100644
--- a/src/gui/icon.h
+++ b/src/gui/icon.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$
  */
 
 
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 17e87afd..644601cf 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.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$
  */
 
 #include "inttextbox.h"
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 219c6018..8dad0c39 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.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$
  */
 
 #ifndef INTTEXTBOX_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 2127442a..82b36aef 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.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$
  */
 
 #include "inventorywindow.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index f9ff8ea2..a7130b65 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.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$
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 6f1c8ae6..c6763014 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.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$
  */
 
 #include "item_amount.h"
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 03303603..dd1026b7 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.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$
  */
 
 #ifndef _TMW_ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 4c528a16..5fb99ffc 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.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$
  */
 
 #include "itemcontainer.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 9ae5c9c2..8d93671c 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.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$
  */
 
 #ifndef _TMW_ITEMCONTAINER_H__
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index cf719f9f..02d35570 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itempopup.h"
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 499b2e0a..cb55296c 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -1,5 +1,4 @@
 /*
-*
  *  The Legend of Mazzeroth
  *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
  *
@@ -19,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_ITEMPOPUP_H__
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 23b41650..76104e12 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.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$
  */
 
 #include "itemshortcutcontainer.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 58f0aea7..76ca870c 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.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$
  */
 
 #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index fb75e20d..e4d352fe 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.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$
  */
 
 #include "itemshortcutwindow.h"
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 9742abdc..017df5ec 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.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$
  */
 
 #ifndef _TMW_ITEMSHORTCUTWINDOW_H
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 3a32f825..44f906db 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.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$
  */
 
 #ifndef _TMW_LINK_HANDLER_H_
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index ac18c2cd..204d7961 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.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$
  */
 
 #include "listbox.h"
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 03a8b541..d42c7d3e 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.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$
  */
 
 #ifndef _TMW_LISTBOX_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 72d7ee51..24c55e37 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.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$
  */
 
 #include "login.h"
diff --git a/src/gui/login.h b/src/gui/login.h
index d8ae7eaf..1c23a0f5 100644
--- a/src/gui/login.h
+++ b/src/gui/login.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$
  */
 
 #ifndef _TMW_LOGIN_H
diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index 28e7de92..a31b661a 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.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: skill.cpp 4569 2008-09-04 20:09:57Z b_lindeijer $
  */
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/magic.h b/src/gui/magic.h
index a8082755..af46c823 100644
--- a/src/gui/magic.h
+++ b/src/gui/magic.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: skill.h 4476 2008-08-18 01:23:58Z rhoderyc $
  */
 
 #ifndef _TMW_MAGIC_H
@@ -32,7 +30,6 @@
 #include "../guichanfwd.h"
 
 
-
 /**
  * The skill dialog.
  *
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index c3e572a7..dbbb08d2 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.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$
  */
 
 #include "menuwindow.h"
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index f43b9921..03ec3380 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.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$
  */
 
 #ifndef _TMW_MENU_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 5f768609..501530f1 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.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$
  */
 
 #include "minimap.h"
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 5e9458bf..f91dc22d 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.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$
  */
 
 #ifndef _TMW_MINIMAP_H
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 3742be64..424c3558 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.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$
  */
 
 #include "ministatus.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 1192bc1e..f512ef25 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.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$
  */
 
 #ifndef _TMW_MINISTATUS_H
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index 6783a546..20fc01bd 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.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$
  */
 
  /* This file implements the new skill dialog for use under the latest
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index 6e12169f..49476e5e 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.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$
  */
 
 #ifndef _TMW_NSKILL_H
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index fd02a14a..c593feb1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.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$
  */
 
 #include "npc_text.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 0ef1b938..2c9771d3 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.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$
  */
 
 #ifndef _TMW_NPC_TEXT_H
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index ff017a0e..918031b4 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.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$
  */
 
 #include "npclistdialog.h"
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 02b9cd49..e21f9e8c 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.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$
  */
 
 #ifndef _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 2d3fce64..3a72b21b 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.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$
  */
 
 #include "npcpostdialog.h"
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index e142dac5..1956c877 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.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$
  */
 
 #ifndef _TMW_GUI_NPCPOSTDIALOG_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 37d66353..b03c3964 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.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$
  */
 
 #include "ok_dialog.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index a7b24a90..cba12d72 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.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$
  */
 
 #ifndef _OK_DIALOG_H
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 1b963dae..262e3b2e 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.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: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #include "partywindow.h"
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index f09eeb6a..e79bf392 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.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: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #ifndef _TMW_PARTYWINDOW_H
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 533f54fb..01c7e15d 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.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$
  */
 
 #include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index cae1f92e..8a14b72a 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.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$
  */
 
 #ifndef _TMW_PASSWORDFIELD_H_
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index e9237110..0a0c8a17 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index c226e750..78eeee91 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.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$
  */
 
 #ifndef __TMW_PLAYERBOX_H__
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 2888382b..59ca0867 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.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$
  */
 
 #include "popupmenu.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 9fe9f866..2d10e6eb 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.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$
  */
 
 #ifndef _TMW_POPUP_MENU_H
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 90a85478..9a47eefc 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.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$
  */
 
 #include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index ddabbb77..0b1616f5 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.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$
  */
 
 #ifndef _TMW_PROGRESSBAR_H
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 7ed4f913..563ed34a 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -17,7 +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
- *
  */
 
 #include "quitdialog.h"
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 97a03f2e..018f1e52 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -17,7 +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
- *
  */
 
 #ifndef _TMW_QUITDIALOG_H
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index 57d6772d..619ec84f 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.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$
  */
 
 #include "radiobutton.h"
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 3b97ad86..09f703dc 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.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$
  */
 
 #ifndef _TMW_RADIOBUTTON_H
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 7e236a7d..051c0fa4 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.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$
  */
 
 #include "register.h"
diff --git a/src/gui/register.h b/src/gui/register.h
index 088e8f9b..79578461 100644
--- a/src/gui/register.h
+++ b/src/gui/register.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$
  */
 
 #ifndef _TMW_REGISTER_H
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 255aa2d8..032e3f78 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index be361f68..d21dae11 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.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$
  */
 
 #ifndef __TMW_SCROLLAREA_H__
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index cef53697..ee94b2c6 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -53,8 +53,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
 
 #include "sdlinput.h"
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index e23178fa..72d949e1 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -53,8 +53,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
 
 #ifndef _TMW_SDLINPUT_
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 37626155..30e78368 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.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$
  */
 
 #include "sell.h"
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 63a16770..742c28fb 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.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$
  */
 
 #ifndef _TMW_SELL_H
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index a6d1d1f0..b11aea6c 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.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$
  */
 
 #include <cstdlib>
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 53474611..268b1baf 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.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$
  */
 
 #ifndef _TMW_SERVERDIALOG_H
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b6b052bc..2a60308b 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 77173367..2142a67d 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.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$
  */
 
 #ifndef _TMW_SETUP_H
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 1ed4fc94..4f09cde0 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.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$
  */
 
 #include "setup_audio.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 6e722f74..eaa55de6 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.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$
  */
 
 #ifndef _TMW_GUI_SETUP_AUDIO_H
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 57adef28..9de5be9f 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.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$
  */
 
 #include "setup_joystick.h"
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 6d3ad129..0b7ebe98 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.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$
  */
 
 #ifndef _TMW_GUI_SETUP_JOYSTICK_H
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 2b785dd5..270f4a0e 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.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$
  */
 
 #include "setup_keyboard.h"
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index b72e8746..50fa76fb 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.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$
  */
 
 #ifndef _TMW_GUI_SETUP_KEYBOARD_H
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4d9b5d74..51cee8e3 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.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$
  */
 
 #include "setup_video.h"
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index e4e9fcf1..17ca1241 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.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$
  */
 
 #ifndef _TMW_GUI_SETUP_VIDEO_H
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index a7d45b9a..6c276c35 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.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$
  */
 
 #ifndef _TMW_GUI_SETUPTAB_H
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 2a7ea0ce..a521c75b 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.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$
  */
 
 #include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index f4329b4d..62b60cae 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.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$
  */
 
 #ifndef _SHOP_H
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index ba77be47..bce6a48c 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.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$
  */
 
 #include "shoplistbox.h"
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index d5e2d836..75f514ab 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.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$
  */
 
 #ifndef _TMW_SHOPLISTBOX_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 49037cbd..49bacaf0 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.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$
  */
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 12f619bd..3d010daa 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.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$
  */
 
 #ifndef _TMW_SKILL_H
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index c94c7bfb..afeecf17 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.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$
  */
 
 #include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index dc38b738..3b796425 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.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$
  */
 
 #ifndef _TMW_SLIDER_H
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 815238b9..d3ef7bbe 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "speechbubble.h"
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index c4ca9109..ed69a8d2 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_SPEECHBUBBLE_H__
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index b9ebfecf..43f81135 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.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$
  */
 
 #include "status.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 6e613495..262b89f6 100644
--- a/src/gui/status.h
+++ b/src/gui/status.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$
  */
 
 #ifndef _TMW_STATUS_H
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 8d16dc46..619265ec 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.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$
  */
 
 #include "textbox.h"
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index f06f98ec..2060e377 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.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$
  */
 
 #ifndef __TMW_TEXTBOX_H__
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index 3986ed4e..05e43906 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.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$
  */
 
 #include "textdialog.h"
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index c03ce7e6..8b4e2cc3 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.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$
  */
 
 #ifndef _TMW_GUI_GUILD_DIALOG_H
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 4fd85d36..49c0c91d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 36f921ac..b808fad2 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.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$
  */
 
 #ifndef __TMW_TEXTFIELD_H__
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index c098c04c..38064f48 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.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$
  */
 
 #include <sstream>
diff --git a/src/gui/trade.h b/src/gui/trade.h
index c8ece8d9..c51e0fdd 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.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$
  */
 
 #ifndef _TMW_TRADE_H
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7f9abd3a..1132c3b5 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.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$
  */
 
 #include "truetypefont.h"
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 6dbc6634..3b39329e 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.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$
  */
 
 #ifndef _TMW_TRUETYPEFONT_H
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 4b8755d5..1e09ca23 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.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$
  */
 
 #include "unregisterdialog.h"
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 8c8eaf64..4056d251 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.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$
  */
 
 #ifndef _TMW_UNREGISTERDIALOG_H
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 22bf8c13..ff1e600c 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.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$
  */
 
 #include "updatewindow.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 61ea4a27..d7e3c4c7 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.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$
  */
 
 #ifndef _UPDATERWINDOW_H
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index b503508e..2ec1112d 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.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$
  */
 
 #include "vbox.h"
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index 06a270ef..2072ab24 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.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$
  */
 
 #ifndef VBOX_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 14239094..1795836d 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.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$
  */
 
 #include "viewport.h"
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 5dedcea8..dd17fa24 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.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$
  */
 
 #ifndef _TMW_VIEWPORT_H_
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 03fa1aeb..68ce5243 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.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$
  */
 
 #include "avatar.h"
diff --git a/src/gui/widgets/avatar.h b/src/gui/widgets/avatar.h
index 3707e8f8..0f657895 100644
--- a/src/gui/widgets/avatar.h
+++ b/src/gui/widgets/avatar.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$
  */
 
 #ifndef _TMW_AVATAR_H
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index b33a55cf..d4c2bc4b 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d0dab7d2..58a18a15 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.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$
  */
 
 #ifndef DROPDOWN_H
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 02ed42a1..bcc54cf7 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.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$
  */
 
 #include <cassert>
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 5914b5c1..d631c154 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.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$
  */
 
 #ifndef _TMW_WIDGET_LAYOUT_H__
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 6be50f2c..c3b537db 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.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$
  */
 
 #include "resizegrip.h"
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 04be3db3..f57eda94 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.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$
  */
 
 #ifndef _TMW_RESIZEGRIP_H
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 990c6a95..c53ac85c 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index b18c93e3..42964b0f 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.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$
  */
 
 #ifndef _TMW_TAB_H
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 7a4d153a..205fdc99 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.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$
  */
 
 #include "tabbedarea.h"
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 554a68b6..2199264b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.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$
  */
 
 #ifndef _TMW_TABBEDAREA_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 2bce49b2..e498236a 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.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$
  */
 
 #include <algorithm>
diff --git a/src/gui/window.h b/src/gui/window.h
index 44982500..22355572 100644
--- a/src/gui/window.h
+++ b/src/gui/window.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$
  */
 
 #ifndef _TMW_WINDOW_H__
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 006dbf44..d8535f73 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.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$
  */
 
 #include "windowcontainer.h"
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index df255f84..88a13d31 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.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$
  */
 
 #ifndef _TMW_WINDOWCONTAINER_H_
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 812f3f7a..4fb7ea3e 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.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$
  */
 
 #ifndef _TMW_GUICHANFWD_H
diff --git a/src/guild.cpp b/src/guild.cpp
index c02af865..68e65cb9 100644
--- a/src/guild.cpp
+++ b/src/guild.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$
  */
 
 #include "guild.h"
diff --git a/src/guild.h b/src/guild.h
index e262d3df..7c85fe31 100644
--- a/src/guild.h
+++ b/src/guild.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$
  */
 
 #ifndef TMW_GUILD_H
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 965434b0..65780345 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.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$
  */
 
 #include "imageparticle.h"
diff --git a/src/imageparticle.h b/src/imageparticle.h
index 0ad515cc..91c5426c 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.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$
  */
 
 #ifndef _IMAGEPARTICLE_H
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 807e1223..85461f90 100644
--- a/src/inventory.cpp
+++ b/src/inventory.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$
  */
 
 #include "inventory.h"
diff --git a/src/inventory.h b/src/inventory.h
index 48ace29c..90d9c7a2 100644
--- a/src/inventory.h
+++ b/src/inventory.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$
  */
 
 #ifndef _INVENTORY_H
diff --git a/src/item.cpp b/src/item.cpp
index 210589e9..374d5051 100644
--- a/src/item.cpp
+++ b/src/item.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$
  */
 
 #include "item.h"
diff --git a/src/item.h b/src/item.h
index fc71e53d..37db52a4 100644
--- a/src/item.h
+++ b/src/item.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$
  */
 
 #ifndef _ITEM_H_
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 59c1ee3b..a89da974 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.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$
  */
 
 #include "itemshortcut.h"
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index d75db2e8..a0c52468 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.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$
  */
 
 #ifndef _TMW_ITEMSHORTCUT_H__
diff --git a/src/joystick.cpp b/src/joystick.cpp
index a5dab4f4..b69537cf 100644
--- a/src/joystick.cpp
+++ b/src/joystick.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$
  */
 
 #include "joystick.h"
diff --git a/src/joystick.h b/src/joystick.h
index 321e3e7d..4cc1babd 100644
--- a/src/joystick.h
+++ b/src/joystick.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$
  */
 
 #ifndef _TMW_JOYSTICK_H
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index a959e244..37d5f276 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.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$
  */
 
 #include "keyboardconfig.h"
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 53a5c96d..d9886150 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.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$
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 30ad7b2e..14d253c0 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.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$
  */
 
 #include "localplayer.h"
diff --git a/src/localplayer.h b/src/localplayer.h
index 16b9715a..5dce5ebe 100644
--- a/src/localplayer.h
+++ b/src/localplayer.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$
  */
 
 #ifndef _TMW_LOCALPLAYER_H
diff --git a/src/lockedarray.h b/src/lockedarray.h
index f31292d7..8e525191 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.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$
  */
 
 #ifndef _TMW_LOCKEDARRAY_H
diff --git a/src/logindata.h b/src/logindata.h
index 689a5aaa..3d959ad4 100644
--- a/src/logindata.h
+++ b/src/logindata.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$
  */
 
 #ifndef _TMW_LOGINDATA_H
diff --git a/src/main.cpp b/src/main.cpp
index ede00d57..33900d5d 100644
--- a/src/main.cpp
+++ b/src/main.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$
  */
 
 #include "main.h"
diff --git a/src/main.h b/src/main.h
index d123834b..49173266 100644
--- a/src/main.h
+++ b/src/main.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$
  */
 
 #ifndef _TMW_MAIN_H
diff --git a/src/map.cpp b/src/map.cpp
index e10e4fad..5c2290d6 100644
--- a/src/map.cpp
+++ b/src/map.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$
  */
 
 #include "map.h"
diff --git a/src/map.h b/src/map.h
index c4a4fc0b..07bf2866 100644
--- a/src/map.h
+++ b/src/map.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$
  */
 
 #ifndef _TMW_MAP_H_
diff --git a/src/monster.cpp b/src/monster.cpp
index 396d0c06..a62c1f4c 100644
--- a/src/monster.cpp
+++ b/src/monster.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$
  */
 
 #include "monster.h"
diff --git a/src/monster.h b/src/monster.h
index bde99ed6..5b6fcf61 100644
--- a/src/monster.h
+++ b/src/monster.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$
  */
 
 #ifndef _TMW_MONSTER_H
diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp
index d1fe6863..f734c4eb 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/accountserver/account.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$
  */
 
 #include "account.h"
diff --git a/src/net/accountserver/account.h b/src/net/accountserver/account.h
index 0cf0758e..581bcb42 100644
--- a/src/net/accountserver/account.h
+++ b/src/net/accountserver/account.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$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_CHARACTER_H
diff --git a/src/net/accountserver/accountserver.cpp b/src/net/accountserver/accountserver.cpp
index db94563b..b1ce590c 100644
--- a/src/net/accountserver/accountserver.cpp
+++ b/src/net/accountserver/accountserver.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$
  */
 
 #include "accountserver.h"
diff --git a/src/net/accountserver/accountserver.h b/src/net/accountserver/accountserver.h
index 8bfe991c..8e0573fc 100644
--- a/src/net/accountserver/accountserver.h
+++ b/src/net/accountserver/accountserver.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$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H
diff --git a/src/net/accountserver/internal.cpp b/src/net/accountserver/internal.cpp
index 28a9695e..a3be76a1 100644
--- a/src/net/accountserver/internal.cpp
+++ b/src/net/accountserver/internal.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$
  */
 
 #include "internal.h"
diff --git a/src/net/accountserver/internal.h b/src/net/accountserver/internal.h
index 8af5ec04..35f986cd 100644
--- a/src/net/accountserver/internal.h
+++ b/src/net/accountserver/internal.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$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_INTERNAL_H
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index dd7d467b..72371da5 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.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$
  */
 
 #include "beinghandler.h"
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 8ac07017..b02728b4 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.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$
  */
 
 #ifndef _TMW_NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 57806edc..596ac434 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.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$
  */
 
 #include "buysellhandler.h"
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index e242d373..52e9b2f7 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.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$
  */
 
 #ifndef _TMW_NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 6cc9e384..bde856a5 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.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$
  */
 
 #include "charserverhandler.h"
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 4a4fe0c3..08ba5102 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.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$
  */
 
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 0cb59403..d81a8b7d 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.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$
  */
 
 #include "chathandler.h"
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 7ca4d50d..aeaf5368 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.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$
  */
 
 #ifndef _TMW_NET_CHATHANDLER_H
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
index f302a0ef..94e36b94 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/chatserver/chatserver.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$
  */
 
 #include "chatserver.h"
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
index 10de1213..1129239a 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/chatserver/chatserver.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$
  */
 
 #ifndef _TMW_NET_CHATSERVER_CHATSERVER_H
diff --git a/src/net/chatserver/guild.cpp b/src/net/chatserver/guild.cpp
index fb400d5d..042ff013 100644
--- a/src/net/chatserver/guild.cpp
+++ b/src/net/chatserver/guild.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$
  */
 
 
diff --git a/src/net/chatserver/guild.h b/src/net/chatserver/guild.h
index 354ecd82..6c35be9f 100644
--- a/src/net/chatserver/guild.h
+++ b/src/net/chatserver/guild.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$
  */
 
 
diff --git a/src/net/chatserver/internal.cpp b/src/net/chatserver/internal.cpp
index c1f7a3f7..0822d93d 100644
--- a/src/net/chatserver/internal.cpp
+++ b/src/net/chatserver/internal.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$
  */
 
 #include "internal.h"
diff --git a/src/net/chatserver/internal.h b/src/net/chatserver/internal.h
index 7579972b..b0f137c5 100644
--- a/src/net/chatserver/internal.h
+++ b/src/net/chatserver/internal.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$
  */
 
 #ifndef _TMW_NET_CHATSERVER_INTERNAL_H
diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp
index ff465924..56eb57d2 100644
--- a/src/net/chatserver/party.cpp
+++ b/src/net/chatserver/party.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$
  */
 
 
diff --git a/src/net/chatserver/party.h b/src/net/chatserver/party.h
index 1d47c2c5..c1febd66 100644
--- a/src/net/chatserver/party.h
+++ b/src/net/chatserver/party.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$
  */
 
 
diff --git a/src/net/connection.cpp b/src/net/connection.cpp
index caaa0ce1..7d3c2328 100644
--- a/src/net/connection.cpp
+++ b/src/net/connection.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$
  */
 
 #include "connection.h"
diff --git a/src/net/connection.h b/src/net/connection.h
index 734c8d65..4ab3d24d 100644
--- a/src/net/connection.h
+++ b/src/net/connection.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$
  */
 
 #ifndef _TMW_NET_CONNECTION_H
diff --git a/src/net/effecthandler.cpp b/src/net/effecthandler.cpp
index 04951d46..f7ff2bf2 100644
--- a/src/net/effecthandler.cpp
+++ b/src/net/effecthandler.cpp
@@ -17,7 +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
- *
  */
 
 #include "effecthandler.h"
diff --git a/src/net/effecthandler.h b/src/net/effecthandler.h
index d836b341..283c7c10 100644
--- a/src/net/effecthandler.h
+++ b/src/net/effecthandler.h
@@ -17,7 +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
- *
  */
 
 #ifndef _TMW_NET_EFFECTSHANDLER_H
diff --git a/src/net/gameserver/gameserver.cpp b/src/net/gameserver/gameserver.cpp
index e451d473..1bdaef26 100644
--- a/src/net/gameserver/gameserver.cpp
+++ b/src/net/gameserver/gameserver.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$
  */
 
 #include "gameserver.h"
diff --git a/src/net/gameserver/gameserver.h b/src/net/gameserver/gameserver.h
index 5bf196b6..5ea2c718 100644
--- a/src/net/gameserver/gameserver.h
+++ b/src/net/gameserver/gameserver.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$
  */
 
 #ifndef _TMW_NET_GAMESERVER_GAMESERVER_H
diff --git a/src/net/gameserver/internal.cpp b/src/net/gameserver/internal.cpp
index 328b4863..6b6ba081 100644
--- a/src/net/gameserver/internal.cpp
+++ b/src/net/gameserver/internal.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$
  */
 
 #include "internal.h"
diff --git a/src/net/gameserver/internal.h b/src/net/gameserver/internal.h
index 567e15d2..df9787fe 100644
--- a/src/net/gameserver/internal.h
+++ b/src/net/gameserver/internal.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$
  */
 
 #ifndef _TMW_NET_GAMESERVER_INTERNAL_H
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index cd85447c..95c13ec2 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.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$
  */
 
 #include "player.h"
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index 75e28270..9e68ced9 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.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$
  */
 
 #ifndef _TMW_NET_GAMESERVER_PLAYER_H
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index f6677cd8..cf886ab3 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.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$
  */
 
 #include <iostream>
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 01ad428b..4eb2da0b 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.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$
  */
 
 #ifndef _TMW_NET_GUILDHANDLER_H
diff --git a/src/net/internal.cpp b/src/net/internal.cpp
index 358aa143..4cb88a4e 100644
--- a/src/net/internal.cpp
+++ b/src/net/internal.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$
  */
 
 #include "internal.h"
diff --git a/src/net/internal.h b/src/net/internal.h
index e1ef648a..1e411605 100644
--- a/src/net/internal.h
+++ b/src/net/internal.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$
  */
 
 #ifndef _TMW_NET_INTERNAL_H
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index dde6a954..41032f13 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.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$
  */
 
 #include "inventoryhandler.h"
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 4190bf83..1326ea71 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.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$
  */
 
 #ifndef _TMW_NET_INVENTORYHANDLER_H
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index ea65bc3b..af06084f 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.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$
  */
 
 #include "itemhandler.h"
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 5ffcb134..e3005a6f 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.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$
  */
 
 #ifndef _TMW_NET_ITEMHANDLER_H
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 6840d90c..f1898fb5 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.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$
  */
 
 #include "loginhandler.h"
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 5bac079c..f557c97b 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.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$
  */
 
 #ifndef _TMW_NET_LOGINHANDLER_H
diff --git a/src/net/logouthandler.cpp b/src/net/logouthandler.cpp
index fb27540f..6dea4c83 100644
--- a/src/net/logouthandler.cpp
+++ b/src/net/logouthandler.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$
  */
 
 #include "logouthandler.h"
diff --git a/src/net/logouthandler.h b/src/net/logouthandler.h
index fa906234..369eaa80 100644
--- a/src/net/logouthandler.h
+++ b/src/net/logouthandler.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$
  */
 
 #ifndef _TMW_NET_LOGOUTHANDLER_H
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index b6074690..973c5555 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.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$
  */
 
 #include "messagehandler.h"
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index a5fc81b3..74226aa5 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.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$
  */
 
 #ifndef _TMW_NET_MESSAGEHANDLER_H
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index b5d5b97a..57c268e7 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.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$
  */
 
 #include "messagein.h"
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 3cc45a23..444699c8 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.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$
  */
 
 #ifndef _TMWSERV_MESSAGEIN_H_
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 10f1b1d4..b08332b6 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.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$
  */
 
 #include <cstring>
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 032db190..4eadda5f 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.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$
  */
 
 #ifndef _TMWSERV_MESSAGEOUT_H_
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 7cf4bf49..a4ea3def 100644
--- a/src/net/network.cpp
+++ b/src/net/network.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$
  */
 
 #include "network.h"
diff --git a/src/net/network.h b/src/net/network.h
index 42590adf..13576e79 100644
--- a/src/net/network.h
+++ b/src/net/network.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$
  */
 
 #ifndef _TMW_NET_NETWORK_H
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 4b08ed8d..30507537 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.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$
  */
 
 #include "npchandler.h"
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 0cb40f64..5560787e 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.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$
  */
 
 #ifndef _TMW_NET_NPCHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 7a9768fa..60c51821 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.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$
  */
 
 #include <iostream>
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index dda78d94..b4257c34 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.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$
  */
 
 #ifndef _TMW_NET_PARTYHANDLER_H
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 3c0a1835..ad271f15 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.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$
  */
 
 #include "playerhandler.h"
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 9b6c9e01..9c5f87cc 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.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$
  */
 
 #ifndef _TMW_NET_PLAYERHANDLER_H
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 2ed414a8..5dfa78da 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.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$
  */
 
 #ifndef _TMW_PROTOCOL_
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index d75350bc..5d93016f 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.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$
  */
 
 #include "tradehandler.h"
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 33dddf05..1a0fa695 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.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$
  */
 
 #ifndef _TMW_NET_TRADEHANDLER_H
diff --git a/src/npc.cpp b/src/npc.cpp
index a7302e0d..5665ad95 100644
--- a/src/npc.cpp
+++ b/src/npc.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$
  */
 
 #include "npc.h"
diff --git a/src/npc.h b/src/npc.h
index 561ad9f0..60f9e6d8 100644
--- a/src/npc.h
+++ b/src/npc.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$
  */
 
 #ifndef _TMW_NPC_H
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 67248100..48b10a1f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.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$
  */
 
 #include "main.h"
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index e6d4850b..ea30e019 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.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$
  */
 
 #ifndef _TMW_OPENGLGRAPHICS_H
diff --git a/src/particle.cpp b/src/particle.cpp
index c59d2c03..8a15a132 100644
--- a/src/particle.cpp
+++ b/src/particle.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$
  */
 
 #include <algorithm>
diff --git a/src/particle.h b/src/particle.h
index 7b46a641..4a11c4cb 100644
--- a/src/particle.h
+++ b/src/particle.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$
  */
 
 #ifndef _PARTICLE_H
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index cd80fb58..d368237c 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.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$
  */
 
 #include "particleemitter.h"
diff --git a/src/particleemitter.h b/src/particleemitter.h
index c237c1ba..4dc2f6fb 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.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$
  */
 
 #ifndef _PARTICLEEMITTER_H
diff --git a/src/player.cpp b/src/player.cpp
index 97c60789..648b330a 100644
--- a/src/player.cpp
+++ b/src/player.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$
  */
 
 #include "player.h"
diff --git a/src/player.h b/src/player.h
index 7e86b1e1..068e3cf5 100644
--- a/src/player.h
+++ b/src/player.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$
  */
 
 #ifndef _TMW_PLAYER_H
diff --git a/src/position.cpp b/src/position.cpp
index 334079bb..cc39a1af 100644
--- a/src/position.cpp
+++ b/src/position.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$
  */
 
 #include "position.h"
diff --git a/src/position.h b/src/position.h
index d1aa2ee6..7beb3ef7 100644
--- a/src/position.h
+++ b/src/position.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: being.h 4570 2008-09-04 20:59:34Z b_lindeijer $
  */
 
 #ifndef TMW_POSITION_H
diff --git a/src/properties.h b/src/properties.h
index 93148bdf..2eafeeca 100644
--- a/src/properties.h
+++ b/src/properties.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$
  */
 
 #ifndef _TMW_PROPERTIES_H_
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 6b3c2f52..ffbbffb2 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.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$
  */
 
 #include "action.h"
diff --git a/src/resources/action.h b/src/resources/action.h
index 8d5e8d11..09eb066e 100644
--- a/src/resources/action.h
+++ b/src/resources/action.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$
  */
 
 #ifndef _TMW_ACTION_H
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 058b6083..9eee57f0 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.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$
  */
 
 #include "ambientoverlay.h"
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index a939cbb4..56c70066 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.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$
  */
 
 #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index de96525c..d2794e61 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.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$
  */
 
 #include "animation.h"
diff --git a/src/resources/animation.h b/src/resources/animation.h
index aad93cda..8dfe8614 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.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$
  */
 
 #ifndef _TMW_ANIMATION_H
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 32d8d9f4..c85105c5 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.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$
  */
 
 #include <algorithm>
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 3791a03a..6a3de8c4 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.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$
  */
 
 #ifndef _TMW_BUDDYLIST_H
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index a43b1204..3be105d8 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.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$
  */
 
 #include <algorithm>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index a11e3365..528a1d91 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.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$
  */
 
 #ifndef _TMW_DYE_H
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index d0dae462..77d77f96 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.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$
  */
 
 #include <SDL_image.h>
diff --git a/src/resources/image.h b/src/resources/image.h
index 52f286f8..3677696f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.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$
  */
 
 #ifndef _TMW_IMAGE_H
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index 6ec5fe8f..29458ba3 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.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$
  */
 
 #include <cassert>
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index f41f6472..7979fd2f 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.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$
  */
 
 #ifndef _TMW_IMAGELOADER_H
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index ba612103..1c0f9373 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.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$
  */
 
 #include "imageset.h"
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index fa1840ec..58b7a8ea 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.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$
  */
 
 #ifndef _TMW_IMAGESET_H
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 7cfa16b4..d6d8a6c2 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.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$
  */
 
 #include "imagewriter.h"
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 205e4584..632e2ae4 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.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$
  */
 
 #include <iosfwd>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 306c0e5a..01688619 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.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$
  */
 
 #include <cassert>
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index df7e7be9..20756a52 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.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$
  */
 
 #ifndef _TMW_ITEM_MANAGER_H
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 4322db8d..cc7a6afc 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.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$
  */
 
 #include "iteminfo.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5b500dcf..7cc3ba15 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.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$
  */
 
 #ifndef _TMW_ITEMINFO_H_
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 33616c0a..cec74717 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.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$
  */
 
 #include "mapreader.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 60056358..0142eb45 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.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$
  */
 
 #ifndef _TMW_MAPREADER_H_
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index f531a41d..1d198a96 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.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$
  */
 
 #include <algorithm>
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 46a33b06..f1d69e72 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.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$
  */
 
 #ifndef _TMW_MONSTER_DB_H
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 263810de..bac9c35f 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.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$
  */
 
 #include "monsterinfo.h"
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index f34a3ea9..f13c2f7c 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.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$
  */
 
 #ifndef _TMW_MONSTERINFO_H_
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 161d8b01..2386aa43 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.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$
  */
 
 #include "music.h"
diff --git a/src/resources/music.h b/src/resources/music.h
index 72e76295..d50150b8 100644
--- a/src/resources/music.h
+++ b/src/resources/music.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$
  */
 
 #ifndef _TMW_MUSIC_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index bc1c920e..5cd6d20d 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.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$
  */
 
 #include "npcdb.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 2abf959b..00b4f99b 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.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$
  */
 
 #ifndef _TMW_NPC_DB_H
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 8f21f5d2..449caf55 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.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$
  */
 
 #include <cassert>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 5b9a5eb8..e85e3147 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.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$
  */
 
 #ifndef _TMW_RESOURCE_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 9c109257..8ee64452 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.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$
  */
 
 #include <cassert>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index da85e2f9..66813a9c 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.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$
  */
 
 #ifndef _TMW_RESOURCE_MANAGER_H
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index ec9bc65c..e21fd2b0 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.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$
  */
 
 #include "soundeffect.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 866c53ec..c3ff6668 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.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$
  */
 
 #ifndef _TMW_SOUND_EFFECT_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index dcfee165..5aea55fa 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.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$
  */
 
 #include <set>
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index e9946a7a..56b9a713 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.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$
  */
 
 #ifndef _TMW_SPRITEDEF_H
diff --git a/src/serverinfo.h b/src/serverinfo.h
index b317b87b..6522da61 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.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$
  */
 
 #ifndef _TMW_SERVERINFO_
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index ed5d30a9..9888f829 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.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$
  */
 
 #include "shopitem.h"
diff --git a/src/shopitem.h b/src/shopitem.h
index 6e7606ac..05a0a67d 100644
--- a/src/shopitem.h
+++ b/src/shopitem.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$
  */
 
 #ifndef _SHOPITEM_H_
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index f425d3c1..e8c26df1 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.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$
  */
 
 #include "simpleanimation.h"
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 561c540d..577268a8 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.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$
  */
 
 #ifndef _TMW_SIMPLEANIMAION_H
diff --git a/src/sound.cpp b/src/sound.cpp
index 0a20d3f2..888dcc31 100644
--- a/src/sound.cpp
+++ b/src/sound.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$
  */
 
 #include "sound.h"
diff --git a/src/sound.h b/src/sound.h
index ebcd6442..0c2af74b 100644
--- a/src/sound.h
+++ b/src/sound.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$
  */
 
 #ifndef _TMW_SOUND_H
diff --git a/src/sprite.h b/src/sprite.h
index 89780519..0e0a95db 100644
--- a/src/sprite.h
+++ b/src/sprite.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$
  */
 
 #ifndef _TMW_SPRITE_H_
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 89466006..308c043d 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.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$
  */
 
 #include "textparticle.h"
diff --git a/src/textparticle.h b/src/textparticle.h
index 34badb57..3a0ba674 100644
--- a/src/textparticle.h
+++ b/src/textparticle.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$
  */
 
 #ifndef _TEXTPARTICLE_H
diff --git a/src/tileset.h b/src/tileset.h
index 625fac1b..fb855831 100644
--- a/src/tileset.h
+++ b/src/tileset.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$
  */
 
 #ifndef _TMW_TILESET_H_
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 9a8f6356..8cea60f9 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/utils/base64.h b/src/utils/base64.h
index ff20ac53..c802207b 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 516fd916..9aa92c84 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$
  */
 
 #ifndef _TMW_UTILS_DTOR_H
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index b7b036e9..78768149 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$
  */
 
 float fastInvSqrt(float x)
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 72533850..0cd9114b 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.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$
  */
 
 #ifndef _TMW_UTILS_GETTEXT_H
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
index 353c60e7..7e3d84f2 100644
--- a/src/utils/minmax.h
+++ b/src/utils/minmax.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$
  */
 
 #include <cstdlib>
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 209d4f96..82d1fc5c 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.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$
  */
 
 /*       +------------------------------------+
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index c03efc0c..66152caf 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.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$
  */
 
 #ifndef _TMW_UTILS_SHA256_H_
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 26313fe9..c8a8a247 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$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index a1fb0f13..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$
  */
 
 #ifndef _TMW_UTILS_STRPRINTF_H
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 95b8985f..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$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/trim.h b/src/utils/trim.h
index fec99100..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$
  */
 
 #ifndef _TMW_UTILS_TRIM_H_
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 98b474cb..47f1bd04 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.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$
  */
 
 #include "xml.h"
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 5473b2ca..5a5c756b 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.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$
  */
 
 #ifndef _TMW_XML_H
diff --git a/src/vector.cpp b/src/vector.cpp
index 88092c9b..7d5f055a 100644
--- a/src/vector.cpp
+++ b/src/vector.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: vector.h 4592 2008-09-07 20:38:52Z b_lindeijer $
  */
 
 #include "vector.h"
diff --git a/src/vector.h b/src/vector.h
index 7251eff0..f32b201a 100644
--- a/src/vector.h
+++ b/src/vector.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$
  */
 
 #ifndef _TMW_VECTOR_H_
diff --git a/tools/dyecmd/src/dye.cpp b/tools/dyecmd/src/dye.cpp
index 73912a96..c93f46c8 100644
--- a/tools/dyecmd/src/dye.cpp
+++ b/tools/dyecmd/src/dye.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$
  */
 
 #include <algorithm>
diff --git a/tools/dyecmd/src/dye.h b/tools/dyecmd/src/dye.h
index a11e3365..528a1d91 100644
--- a/tools/dyecmd/src/dye.h
+++ b/tools/dyecmd/src/dye.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$
  */
 
 #ifndef _TMW_DYE_H
diff --git a/tools/dyecmd/src/dyecmd.cpp b/tools/dyecmd/src/dyecmd.cpp
index 7254e287..8938aea5 100644
--- a/tools/dyecmd/src/dyecmd.cpp
+++ b/tools/dyecmd/src/dyecmd.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$
  */
 
 #include <iostream>
diff --git a/tools/dyecmd/src/imagewriter.cpp b/tools/dyecmd/src/imagewriter.cpp
index 36c139b9..9b4b10dc 100644
--- a/tools/dyecmd/src/imagewriter.cpp
+++ b/tools/dyecmd/src/imagewriter.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$
  */
 
 #include "imagewriter.h"
diff --git a/tools/dyecmd/src/imagewriter.h b/tools/dyecmd/src/imagewriter.h
index 205e4584..632e2ae4 100644
--- a/tools/dyecmd/src/imagewriter.h
+++ b/tools/dyecmd/src/imagewriter.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$
  */
 
 #include <iosfwd>
diff --git a/tools/tmxcopy/base64.cpp b/tools/tmxcopy/base64.cpp
index 9a8f6356..8cea60f9 100644
--- a/tools/tmxcopy/base64.cpp
+++ b/tools/tmxcopy/base64.cpp
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/tools/tmxcopy/base64.h b/tools/tmxcopy/base64.h
index ff20ac53..c802207b 100644
--- a/tools/tmxcopy/base64.h
+++ b/tools/tmxcopy/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h
index 95b8985f..d2dd941a 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/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$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/tools/tmxcopy/xmlutils.cpp b/tools/tmxcopy/xmlutils.cpp
index 47bff51a..8b1b62cf 100644
--- a/tools/tmxcopy/xmlutils.cpp
+++ b/tools/tmxcopy/xmlutils.cpp
@@ -17,7 +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
- *
  */
 
 #include "xmlutils.h"
diff --git a/tools/tmxcopy/xmlutils.h b/tools/tmxcopy/xmlutils.h
index 32d1a960..60e8f3cd 100644
--- a/tools/tmxcopy/xmlutils.h
+++ b/tools/tmxcopy/xmlutils.h
@@ -17,7 +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
- *
  */
 
 #ifndef _XMLUTILS_H
-- 
cgit v1.2.3-60-g2f50