Removed a lot of useless "documentation"

I have to admit I contributed a large part of these. Sorry for that.
Less empty space, more attention to the code.

Acked-by: Jared Adams

59 files changed, 13 insertions, 302 deletions

diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h
index 514a6e7e..7058d783 100644
--- a/src/gui/beingpopup.h
+++ b/src/gui/beingpopup.h
@@ -32,14 +32,8 @@ class Label;
 class BeingPopup : public Popup
 {
     public:
-        /**
-         * Constructor. Initializes the being popup.
-         */
         BeingPopup();
 
-        /**
-         * Destructor. Cleans up the being popup on deletion.
-         */
         ~BeingPopup();
 
         /**
diff --git a/src/gui/buy.h b/src/gui/buy.h
index c3cb3229..68d318eb 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -42,16 +42,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
                   public gcn::SelectionListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         BuyDialog(int npcId);
 
-        /**
-         * Destructor
-         */
         ~BuyDialog();
 
         /**
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 84838d15..04fca908 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -38,16 +38,8 @@ class WrongDataNoticeListener;
 class ChangeEmailDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         ChangeEmailDialog(LoginData *loginData);
 
-        /**
-         * Destructor.
-         */
         ~ChangeEmailDialog();
 
         /**
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index d356a5df..0b28a11d 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -38,16 +38,8 @@ class WrongDataNoticeListener;
 class ChangePasswordDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor
-         *
-         * @see Window::Window
-         */
         ChangePasswordDialog(LoginData *loginData);
 
-        /**
-         * Destructor
-         */
         ~ChangePasswordDialog();
 
         /**
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index d6b6d390..ff59b30a 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -45,14 +45,8 @@ class PlayerBox;
 class CharCreateDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         CharCreateDialog(CharSelectDialog *parent, int slot);
 
-        /**
-         * Destructor.
-         */
         ~CharCreateDialog();
 
         void action(const gcn::ActionEvent &event);
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 455ec2df..e180b2c2 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -50,9 +50,6 @@ class CharSelectDialog : public Window, public gcn::ActionListener,
         friend class CharDeleteConfirm;
         friend class Net::CharHandler;
 
-        /**
-         * Constructor.
-         */
         CharSelectDialog(LoginData *loginData);
 
         ~CharSelectDialog();
diff --git a/src/gui/chat.h b/src/gui/chat.h
index b0d2bfa8..c6acf532 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -80,9 +80,6 @@ class ChatWindow : public Window,
                    public EventListener
 {
     public:
-        /**
-         * Constructor.
-         */
         ChatWindow();
 
         /**
diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h
index 074b970d..49e9c127 100644
--- a/src/gui/confirmdialog.h
+++ b/src/gui/confirmdialog.h
@@ -36,11 +36,6 @@ class TextBox;
 class ConfirmDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         ConfirmDialog(const std::string &title, const std::string &msg,
                       Window *parent = NULL);
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 53828422..6fd34420 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -34,9 +34,6 @@ class Label;
 class DebugWindow : public Window
 {
     public:
-        /**
-         * Constructor.
-         */
         DebugWindow();
 
         /**
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index a0fa6acb..5ba15ae3 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -40,14 +40,8 @@ class ItemPopup;
 class EquipmentWindow : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         EquipmentWindow(Equipment *equipment);
 
-        /**
-         * Destructor.
-         */
         ~EquipmentWindow();
 
         /**
@@ -91,25 +85,17 @@ namespace TmwAthena {
 class TaEquipmentWindow : public EquipmentWindow
 {
     public:
-        /**
-         * Constructor.
-         */
         TaEquipmentWindow(Equipment *equipment);
-
-        /**
-         * Destructor.
-         */
         ~TaEquipmentWindow();
 
         /**
          * Draws the equipment window using TmwAthena routine.
          */
         void draw(gcn::Graphics *graphics);
-
 };
 
-}; // namespace TmwAthena
+} // namespace TmwAthena
 
 extern EquipmentWindow *equipmentWindow;
 
-#endif
+#endif // EQUIPMENTWINDOW_H
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 112abcee..fa7102fe 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -47,14 +47,8 @@ class SDLInput;
 class Gui : public gcn::Gui
 {
     public:
-        /**
-         * Constructor.
-         */
         Gui(Graphics *screen);
 
-        /**
-         * Destructor.
-         */
         ~Gui();
 
         /**
diff --git a/src/gui/help.h b/src/gui/help.h
index 581a971e..add49ced 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -37,9 +37,6 @@ class HelpWindow : public Window, public LinkHandler,
                    public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         HelpWindow();
 
         /**
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 0cdb1dbd..ebd2be22 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -52,14 +52,8 @@ class InventoryWindow : public Window,
                         public EventListener
 {
     public:
-        /**
-         * Constructor.
-         */
         InventoryWindow(Inventory *inventory);
 
-        /**
-         * Destructor.
-         */
         ~InventoryWindow();
 
         /**
diff --git a/src/gui/login.h b/src/gui/login.h
index 93bae338..38e858f6 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -42,11 +42,6 @@ class LoginDialog : public Window, public gcn::ActionListener,
                     public gcn::KeyListener
 {
     public:
-        /**
-         * Constructor
-         *
-         * @see Window::Window
-         */
         LoginDialog(LoginData *loginData);
 
         ~LoginDialog();
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 976e0d14..433c045e 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -48,11 +48,6 @@ class NpcDialog : public Window, public gcn::ActionListener,
                   public gcn::ListModel, public EventListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         NpcDialog(int npcId);
 
         ~NpcDialog();
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index 248e4515..db8d1a68 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -32,9 +32,6 @@ class TextField;
 class NpcPostDialog : public Window, public gcn::ActionListener
 {
 public:
-    /**
-     * Constructor
-     */
     NpcPostDialog(int npcId);
 
     ~NpcPostDialog();
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h
index 9974e235..68841566 100644
--- a/src/gui/okdialog.h
+++ b/src/gui/okdialog.h
@@ -36,11 +36,6 @@ class TextBox;
 class OkDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         OkDialog(const std::string &title, const std::string &msg,
                  bool modal = true, Window *parent = NULL);
 
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index a6051ecb..21cf6940 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -37,14 +37,8 @@ class Label;
 class OutfitWindow : public Window, gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         OutfitWindow();
 
-        /**
-         * Destructor.
-         */
         ~OutfitWindow();
 
         void action(const gcn::ActionEvent &event);
diff --git a/src/gui/palette.h b/src/gui/palette.h
index ee748e74..51cf7d5f 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -127,14 +127,8 @@ class Palette
         typedef std::set<Palette*> Palettes;
         static Palettes mInstances;
 
-        /**
-         * Constructor
-         */
         Palette(int size);
 
-        /**
-         * Destructor
-         */
         ~Palette();
 
         void advanceGradient();
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 3bb49967..969c5c20 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -37,9 +37,6 @@ class Window;
 class PopupMenu : public Popup, public LinkHandler
 {
     public:
-        /**
-         * Constructor.
-         */
         PopupMenu();
 
         /**
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index d0dc2c69..65a325b8 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -45,9 +45,6 @@ class QuitDialog : public Window, public gcn::ActionListener,
          */
         QuitDialog(QuitDialog **pointerToMe);
 
-        /**
-         * Destructor
-         */
         ~QuitDialog();
 
         /**
diff --git a/src/gui/register.h b/src/gui/register.h
index 3c65695b..fe54812b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -63,9 +63,6 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          */
         RegisterDialog(LoginData *loginData);
 
-        /**
-         * Destructor
-         */
         ~RegisterDialog();
 
         /**
diff --git a/src/gui/sell.h b/src/gui/sell.h
index c286dcc2..8db0b573 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -41,16 +41,8 @@ class ShopListBox;
 class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
 {
     public:
-        /**
-         * Constructor.
-         *
-         * @see Window::Window
-         */
         SellDialog(int npcId);
 
-        /**
-         * Destructor
-         */
         virtual ~SellDialog();
 
         /**
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index a222912d..d34fbb9f 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -111,16 +111,8 @@ class ServerDialog : public Window,
                      public gcn::SelectionListener
 {
     public:
-        /**
-         * Constructor
-         *
-         * @see Window::Window
-         */
         ServerDialog(ServerInfo *serverInfo, const std::string &dir);
 
-        /**
-         * Destructor
-         */
         ~ServerDialog();
 
         /**
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 4c916705..5a455adb 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -32,14 +32,8 @@
 class Setup_Keyboard : public SetupTab, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor
-         */
         Setup_Keyboard();
 
-        /**
-         * Destructor
-         */
         ~Setup_Keyboard();
 
         void apply();
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 2ef7ce6c..0c2ebf83 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -61,14 +61,8 @@ extern Graphics *graphics;
 class ModeListModel : public gcn::ListModel
 {
     public:
-        /**
-         * Constructor.
-         */
         ModeListModel();
 
-        /**
-         * Destructor.
-         */
         virtual ~ModeListModel() { }
 
         /**
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index a0f82541..f5905e31 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -35,14 +35,8 @@ class ShortcutContainer;
 class ShortcutWindow : public Window
 {
     public:
-        /**
-         * Constructor.
-         */
         ShortcutWindow(const std::string &title, ShortcutContainer *content);
 
-        /**
-         * Destructor.
-         */
         ~ShortcutWindow();
 
     private:
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 6017398a..7316cf96 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -32,9 +32,6 @@ class TextBox;
 class SpeechBubble : public Popup
 {
     public:
-        /**
-         * Constructor. Initializes the speech bubble.
-         */
         SpeechBubble();
 
         /**
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 53bc05cf..9120d978 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -43,9 +43,6 @@ class VertContainer;
 class StatusWindow : public Window, public EventListener
 {
     public:
-        /**
-         * Constructor.
-         */
         StatusWindow();
 
         void event(Event::Channel channel, const Event &event);
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index aa8fcf8f..ccaa69ce 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -36,11 +36,6 @@ class TextField;
 class TextDialog : public Window, public gcn::ActionListener
 {
 public:
-    /**
-     * Constructor.
-     *
-     * @see Window::Window
-     */
     TextDialog(const std::string &title, const std::string &msg,
                Window *parent = NULL, bool autoCompleteEnabled = false);
 
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index 51646590..04911d37 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -36,21 +36,15 @@ class TextBox;
 class TextPopup : public Popup
 {
     public:
-        /**
-         * Constructor. Initializes the item popup.
-         */
         TextPopup();
 
-        /**
-         * Destructor. Cleans up the item popup on deletion.
-         */
         ~TextPopup();
 
         /**
          * Sets the text to be displayed.
          */
         void show(int x, int y, const std::string &str1)
-        { show(x, y, str1, (const char*)""); };
+        { show(x, y, str1, (const char*)""); }
 
         /**
          * Sets the text to be displayed.
diff --git a/src/gui/trade.h b/src/gui/trade.h
index e22f8863..f854d698 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -42,14 +42,8 @@ class ScrollArea;
 class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         TradeWindow();
 
-        /**
-         * Destructor.
-         */
         ~TradeWindow();
 
         /**
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 689f45bf..41db3f86 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -56,9 +56,6 @@ class TrueTypeFont : public gcn::Font
          */
         TrueTypeFont(const std::string &filename, int size, int style = 0);
 
-        /**
-         * Destructor.
-         */
         ~TrueTypeFont();
 
         virtual int getWidth(const std::string &text) const;
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 87999d5d..503e0258 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -38,11 +38,6 @@ class WrongDataNoticeListener;
 class UnRegisterDialog : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor
-         *
-         * @see Window::Window
-         */
         UnRegisterDialog(LoginData *loginData);
 
         ~UnRegisterDialog();
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index a62a2ad7..4f6d428a 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -71,9 +71,6 @@ class UpdaterWindow : public Window, public gcn::ActionListener,
                   const std::string &updatesDir,
                   bool applyUpdates);
 
-    /**
-     * Destructor
-     */
     ~UpdaterWindow();
 
     /**
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index ce535a64..d8687219 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -57,14 +57,8 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         public EventListener
 {
     public:
-        /**
-         * Constructor.
-         */
         Viewport();
 
-        /**
-         * Destructor.
-         */
         ~Viewport();
 
         /**
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 54a2a8cc..28ec734a 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -72,14 +72,8 @@ class BrowserBox : public gcn::Widget,
                    public gcn::MouseListener
 {
     public:
-        /**
-         * Constructor.
-         */
         BrowserBox(unsigned int mode = AUTO_SIZE, bool opaque = true);
 
-        /**
-         * Destructor.
-         */
         ~BrowserBox();
 
         /**
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index aa37261e..b750d9bb 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -46,9 +46,6 @@ class Button : public gcn::Button
         Button(const std::string &caption, const std::string &actionEventId,
                 gcn::ActionListener *listener);
 
-        /**
-         * Destructor.
-         */
         ~Button();
 
         /**
diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h
index 842b80f7..0272655b 100644
--- a/src/gui/widgets/channeltab.h
+++ b/src/gui/widgets/channeltab.h
@@ -43,14 +43,8 @@ class ChannelTab : public ChatTab
     protected:
         friend class Channel;
 
-        /**
-         * Constructor.
-         */
         ChannelTab(Channel *channel);
 
-        /**
-         * Destructor.
-         */
         ~ChannelTab();
 
         void handleInput(const std::string &msg);
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 1e187f23..6d262e11 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -37,9 +37,6 @@ class ScrollArea;
 class ChatTab : public Tab, public AutoCompleteLister
 {
     public:
-        /**
-         * Constructor.
-         */
         ChatTab(const std::string &name);
         ~ChatTab();
 
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index a7daa52d..27962f72 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -34,14 +34,8 @@ class Image;
 class CheckBox : public gcn::CheckBox
 {
     public:
-        /**
-         * Constructor.
-         */
         CheckBox(const std::string &caption, bool selected = false);
 
-        /**
-         * Destructor.
-         */
         ~CheckBox();
 
         /**
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index c3fb9d14..0021d838 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -35,14 +35,8 @@ class ImageSprite;
 class EmoteShortcutContainer : public ShortcutContainer
 {
     public:
-        /**
-         * Constructor. Initializes the graphic.
-         */
         EmoteShortcutContainer();
 
-        /**
-         * Destructor.
-         */
         virtual ~EmoteShortcutContainer();
 
         /**
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index a0e8dbf5..ee9f634b 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -34,17 +34,9 @@ class FlowContainer : public Container,
                       public gcn::WidgetListener
 {
     public:
-        /**
-         * Constructor. Initializes the shortcut container.
-         */
         FlowContainer(int boxWidth, int boxHeight);
 
         /**
-         * Destructor.
-         */
-        ~FlowContainer() {}
-
-        /**
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 27ed0db8..7b297756 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -36,6 +36,8 @@ class Icon : public gcn::Widget
     public:
         /**
          * Constructor.
+         *
+         * @param filename The file name of the image to display
          */
         Icon(const std::string &filename);
 
@@ -44,7 +46,7 @@ class Icon : public gcn::Widget
          */
         Icon(Image *image);
 
-        /** 
+        /**
          * Gets the current Image.
          */
         Image *getImage() const { return mImage; }
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 89012a37..ca21ad3f 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -60,9 +60,6 @@ class ItemContainer : public gcn::Widget,
          */
         ItemContainer(Inventory *inventory, bool forceQuantity = false);
 
-        /**
-         * Destructor.
-         */
         virtual ~ItemContainer();
 
         /**
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 9ec3f4c1..80f29c7b 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -38,14 +38,8 @@ class ItemPopup;
 class ItemShortcutContainer : public ShortcutContainer
 {
     public:
-        /**
-         * Constructor. Initializes the graphic.
-         */
         ItemShortcutContainer();
 
-        /**
-         * Destructor.
-         */
         virtual ~ItemShortcutContainer();
 
         /**
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 2dfa254c..6b9cd2a8 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -1,6 +1,6 @@
 /*
  *  The Mana Client
- *  Copyright (c) 2009  Aethyra Development Team 
+ *  Copyright (c) 2009  Aethyra Development Team
  *
  *  This file is part of The Mana Client.
  *
@@ -32,9 +32,6 @@
 class Label : public gcn::Label
 {
     public:
-        /**
-         * Constructor.
-         */
         Label();
 
         /**
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index cf966029..0aeabb0d 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -34,14 +34,8 @@
 class LayoutHelper : public gcn::WidgetListener
 {
     public:
-        /**
-         * Constructor.
-         */
         LayoutHelper(gcn::Container *container);
 
-        /**
-         * Destructor.
-         */
         ~LayoutHelper();
 
         /**
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 8b8c8b54..92505c15 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -36,9 +36,6 @@ class SelectionListener;
 class ListBox : public gcn::ListBox
 {
     public:
-        /**
-         * Constructor.
-         */
         ListBox(gcn::ListModel *listModel);
 
         ~ListBox();
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 619cd842..0058233c 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -35,7 +35,7 @@ class PasswordField : public TextField
         /**
          * Constructor, initializes the password field with the given string.
          */
-        PasswordField(const std::string &text = "");
+        PasswordField(const std::string &text = std::string());
 
         /**
          * Draws the password field.
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 4ce6782d..f6e70ef7 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -41,9 +41,6 @@ class PlayerBox : public gcn::ScrollArea
          */
         PlayerBox(const Being *being = 0);
 
-        /**
-         * Destructor.
-         */
         ~PlayerBox();
 
         /**
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 7f839ea5..f8aa40f1 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -32,15 +32,9 @@ class Image;
 class RadioButton : public gcn::RadioButton
 {
     public:
-        /**
-         * Constructor.
-         */
         RadioButton(const std::string &caption,const std::string &group,
                 bool marked = false);
 
-        /**
-         * Destructor.
-         */
         ~RadioButton();
 
         /**
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 5ef93f29..319b574f 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -36,14 +36,8 @@ class Image;
 class ResizeGrip : public gcn::Widget
 {
     public:
-        /**
-         * Constructor.
-         */
         ResizeGrip(const std::string &image = "resize.png");
 
-        /**
-         * Destructor.
-         */
         ~ResizeGrip();
 
         /**
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 087bdd53..325cb562 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -37,9 +37,6 @@ class ItemPopup;
 class ShopListBox : public ListBox
 {
     public:
-        /**
-         * Constructor.
-         */
         ShopListBox(gcn::ListModel *listModel);
 
         /**
@@ -47,9 +44,6 @@ class ShopListBox : public ListBox
          */
         ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel);
 
-        /**
-         * Destructor
-         */
         ~ShopListBox();
 
         /**
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 9404ffd2..e511d7f9 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -38,14 +38,8 @@ class ShortcutContainer : public gcn::Widget,
                           public gcn::MouseListener
 {
     public:
-        /**
-         * Constructor. Initializes the shortcut container.
-         */
         ShortcutContainer();
 
-        /**
-         * Destructor.
-         */
         ~ShortcutContainer() {}
 
         /**
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 9b26e404..408210ac 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -31,7 +31,8 @@ class Image;
  *
  * \ingroup GUI
  */
-class Slider : public gcn::Slider {
+class Slider : public gcn::Slider
+{
     public:
         /**
          * Constructor with scale start equal to 0.
@@ -40,12 +41,12 @@ class Slider : public gcn::Slider {
 
         /**
          * Constructor.
+         *
+         * @param scaleStart The minimum value of the slider
+         * @param scaleEnd   The maximum value of the slider
          */
         Slider(double scaleStart, double scaleEnd);
 
-        /**
-         * Destructor.
-         */
         ~Slider();
 
         /**
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 19393f8b..d364eac5 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -39,9 +39,6 @@ class Tab;
 class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
 {
     public:
-        /**
-         * Constructor.
-         */
         TabbedArea();
 
         /**
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 3b6778d2..6b947e0b 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -34,9 +34,6 @@
 class TextBox : public gcn::TextBox
 {
     public:
-        /**
-         * Constructor.
-         */
         TextBox();
 
         inline void setTextColor(const gcn::Color *color)
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index b51110b4..624560c3 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -43,16 +43,8 @@ class WorldListModel;
 class WorldSelectDialog : public Window, public gcn::ActionListener,
                           public gcn::KeyListener {
     public:
-        /**
-         * Constructor
-         *
-         * @see Window::Window
-         */
         WorldSelectDialog(Worlds worlds);
 
-        /**
-         * Destructor.
-         */
         ~WorldSelectDialog();
 
         /**