1 files changed, 15 insertions, 35 deletions

diff --git a/src/gui/popup.h b/src/gui/popup.h
index c68c2098..6fbe796c 100644
--- a/src/gui/popup.h
+++ b/src/gui/popup.h
@@ -1,9 +1,9 @@
 /*
- *  Aethyra
+ *  The Mana World
+ *  Copyright (C) 2004  The Mana World Development Team
  *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ class Popup : public gcn::Container
          *                debugging purposes.
          * @param skin    The location where the Popup's skin XML can be found.
          */
-        Popup(const std::string& name = "",
+        Popup(const std::string &name = "",
               const std::string &skin = "graphics/gui/gui.xml");
 
         /**
@@ -97,39 +97,27 @@ class Popup : public gcn::Container
          */
         void setMinWidth(int width);
 
+        int getMinWidth() const { return mMinWidth; }
+
         /**
          * Sets the minimum height of the popup.
          */
         void setMinHeight(int height);
 
+        int getMinHeight() const { return mMinHeight; }
+
         /**
          * Sets the maximum width of the popup.
          */
         void setMaxWidth(int width);
 
+        int getMaxWidth() const { return mMaxWidth; }
+
         /**
          * Sets the minimum height of the popup.
          */
         void setMaxHeight(int height);
 
-        /**
-         * Gets the minimum width of the popup.
-         */
-        int getMinWidth() const { return mMinWidth; }
-
-        /**
-         * Gets the minimum height of the popup.
-         */
-        int getMinHeight() const { return mMinHeight; }
-
-        /**
-         * Gets the maximum width of the popup.
-         */
-        int getMaxWidth() const { return mMaxWidth; }
-
-        /**
-         * Gets the minimum height of the popup.
-         */
         int getMaxHeight() const { return mMaxHeight; }
 
         /**
@@ -141,24 +129,16 @@ class Popup : public gcn::Container
          */
         int getPadding() const { return mPadding; }
 
-        /**
-         * Sets the padding of the popup. The padding is the distance between the
-         * popup border and the content.
-         *
-         * @param padding The padding of the popup.
-         * @see getPadding
-         */
         void setPadding(int padding) { mPadding = padding; }
 
         /**
          * Sets the name of the popup. This is only useful for debug purposes.
          */
-        void setPopupName(const std::string &name) { mPopupName = name; }
+        void setPopupName(const std::string &name)
+        { mPopupName = name; }
 
-        /**
-         * Returns the name of the popup. This is only useful for debug purposes.
-         */
-        const std::string& getPopupName() { return mPopupName; }
+        const std::string &getPopupName() const
+        { return mPopupName; }
 
         /**
          * Schedule this popup for deletion. It will be deleted at the start
@@ -179,7 +159,7 @@ class Popup : public gcn::Container
         int mMaxHeight;               /**< Maximum popup height */
         int mPadding;                 /**< Holds the padding of the popup. */
 
-        Skin* mSkin;                  /**< Skin in use by this popup */
+        Skin *mSkin;                  /**< Skin in use by this popup */
 };
 
 #endif