summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-09-22 01:34:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-09-22 01:34:49 +0300
commit3dcf21babe03cee5080a25e787e1d7e72124288e (patch)
tree7051c6beddd3e7e1de960bb84e46601db8e2e5c4 /src/gui/widgets
parentc217b7141df580b686a0eef085bd0eb0a8e6771a (diff)
downloadmv-3dcf21babe03cee5080a25e787e1d7e72124288e.tar.gz
mv-3dcf21babe03cee5080a25e787e1d7e72124288e.tar.bz2
mv-3dcf21babe03cee5080a25e787e1d7e72124288e.tar.xz
mv-3dcf21babe03cee5080a25e787e1d7e72124288e.zip
Add final keyword to most classes.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.h2
-rw-r--r--src/gui/widgets/battletab.h2
-rw-r--r--src/gui/widgets/browserbox.h8
-rw-r--r--src/gui/widgets/button.h2
-rw-r--r--src/gui/widgets/channeltab.h2
-rw-r--r--src/gui/widgets/checkbox.h2
-rw-r--r--src/gui/widgets/desktop.h2
-rw-r--r--src/gui/widgets/dropdown.h2
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h2
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h2
-rw-r--r--src/gui/widgets/extendedlistbox.h2
-rw-r--r--src/gui/widgets/flowcontainer.h4
-rw-r--r--src/gui/widgets/guildchattab.h2
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/guitable.h8
-rw-r--r--src/gui/widgets/horizontcontainer.h2
-rw-r--r--src/gui/widgets/icon.h2
-rw-r--r--src/gui/widgets/inttextfield.h2
-rw-r--r--src/gui/widgets/itemcontainer.cpp12
-rw-r--r--src/gui/widgets/itemcontainer.h8
-rw-r--r--src/gui/widgets/itemlinkhandler.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h2
-rw-r--r--src/gui/widgets/label.h2
-rw-r--r--src/gui/widgets/layout.h6
-rw-r--r--src/gui/widgets/layouthelper.h2
-rw-r--r--src/gui/widgets/mouseevent.h2
-rw-r--r--src/gui/widgets/passwordfield.h2
-rw-r--r--src/gui/widgets/playerbox.h2
-rw-r--r--src/gui/widgets/progressbar.h2
-rw-r--r--src/gui/widgets/progressindicator.h2
-rw-r--r--src/gui/widgets/radiobutton.h2
-rw-r--r--src/gui/widgets/radiogroup.h2
-rw-r--r--src/gui/widgets/scrollarea.h2
-rw-r--r--src/gui/widgets/setupitem.h16
-rw-r--r--src/gui/widgets/shopitems.h4
-rw-r--r--src/gui/widgets/shoplistbox.h2
-rw-r--r--src/gui/widgets/slider.h2
-rw-r--r--src/gui/widgets/sliderlist.h6
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h2
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/tablemodel.h4
-rw-r--r--src/gui/widgets/tabstrip.h2
-rw-r--r--src/gui/widgets/textbox.h2
-rw-r--r--src/gui/widgets/textpreview.h2
-rw-r--r--src/gui/widgets/tradetab.h2
-rw-r--r--src/gui/widgets/vertcontainer.h2
-rw-r--r--src/gui/widgets/whispertab.h2
47 files changed, 77 insertions, 73 deletions
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 995ffebe6..9ab56e9b0 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -43,7 +43,7 @@ public:
{ return getAvatarAt(i)->getName(); }
};
-class AvatarListBox : public ListBox, public ConfigListener
+class AvatarListBox final : public ListBox, public ConfigListener
{
public:
AvatarListBox(AvatarListModel *const model);
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h
index 2a034a166..12ba23ebf 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/battletab.h
@@ -28,7 +28,7 @@
/**
* A tab for a party chat channel.
*/
-class BattleTab : public ChatTab
+class BattleTab final : public ChatTab
{
public:
BattleTab();
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index ed7208031..e95507c8c 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -36,14 +36,14 @@ class Image;
class Resource;
class LinkHandler;
-struct BROWSER_LINK
+struct BROWSER_LINK final
{
int x1, x2, y1, y2; /**< Where link is placed */
std::string link;
std::string caption;
};
-class LinePart
+class LinePart final
{
public:
LinePart(const int x, const int y, const gcn::Color color,
@@ -74,8 +74,8 @@ class LinePart
* A simple browser box able to handle links and forward events to the
* parent conteiner.
*/
-class BrowserBox : public gcn::Widget,
- public gcn::MouseListener
+class BrowserBox final : public gcn::Widget,
+ public gcn::MouseListener
{
public:
/**
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index f57e9a7cd..fbc040171 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -39,7 +39,7 @@ const std::string BUTTON_PLAY = "buttonplay.png";
*
* \ingroup GUI
*/
-class Button : public gcn::Button, public gcn::WidgetListener
+class Button final : public gcn::Button, public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h
index d78027b67..92126e929 100644
--- a/src/gui/widgets/channeltab.h
+++ b/src/gui/widgets/channeltab.h
@@ -30,7 +30,7 @@ class Channel;
/**
* A tab for a chat channel.
*/
-class ChannelTab : public ChatTab
+class ChannelTab final : public ChatTab
{
public:
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index ff1c2d56c..bb3cf751a 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -34,7 +34,7 @@ class Image;
*
* \ingroup GUI
*/
-class CheckBox : public gcn::CheckBox
+class CheckBox final : public gcn::CheckBox
{
public:
/**
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 1ca411732..3cff9a75a 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -46,7 +46,7 @@ namespace gcn
*
* \ingroup GUI
*/
-class Desktop : public Container, private gcn::WidgetListener
+class Desktop final : public Container, private gcn::WidgetListener
{
public:
Desktop();
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index c01466c03..813a19e5f 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -37,7 +37,7 @@ class ImageRect;
* DropDown you must give DropDown an implemented ListModel which represents
* your list.
*/
-class DropDown : public gcn::DropDown
+class DropDown final : public gcn::DropDown
{
public:
/**
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 99ff8bd2e..0544bf07c 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -36,7 +36,7 @@ class ItemPopup;
*
* \ingroup GUI
*/
-class DropShortcutContainer : public ShortcutContainer
+class DropShortcutContainer final : public ShortcutContainer
{
public:
/**
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 14f41bdd3..56a1629d7 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -37,7 +37,7 @@ class TextPopup;
*
* \ingroup GUI
*/
-class EmoteShortcutContainer : public ShortcutContainer
+class EmoteShortcutContainer final : public ShortcutContainer
{
public:
/**
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 8d323ae68..196189674 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -23,7 +23,7 @@
#include "gui/widgets/listbox.h"
-class ExtendedListBox : public ListBox
+class ExtendedListBox final : public ListBox
{
public:
/**
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index c58a8f121..f0d1d9638 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -31,8 +31,8 @@
*
* \ingroup GUI
*/
-class FlowContainer : public Container,
- public gcn::WidgetListener
+class FlowContainer final : public Container,
+ public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
index 358c1f1d4..a8f47db25 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -28,7 +28,7 @@
/**
* A tab for a guild chat channel.
*/
-class GuildChatTab : public ChatTab
+class GuildChatTab final : public ChatTab
{
public:
GuildChatTab();
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 4cd6d03cf..7005386b6 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -39,7 +39,7 @@
float GuiTable::mAlpha = 1.0;
-class GuiTableActionListener : public gcn::ActionListener
+class GuiTableActionListener final : public gcn::ActionListener
{
public:
GuiTableActionListener(GuiTable *_table, gcn::Widget *_widget,
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 77abfdd4b..af6bedb62 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -44,10 +44,10 @@ class GuiTableActionListener;
*
* \ingroup GUI
*/
-class GuiTable : public gcn::Widget,
- public gcn::MouseListener,
- public gcn::KeyListener,
- public TableModelListener
+class GuiTable final : public gcn::Widget,
+ public gcn::MouseListener,
+ public gcn::KeyListener,
+ public TableModelListener
{
// so that the action listener can call distributeActionEvent
friend class GuiTableActionListener;
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index b41370ac1..736d8fd98 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -31,7 +31,7 @@
*
* This container places it's contents veritcally.
*/
-class HorizontContainer : public Container, public gcn::WidgetListener
+class HorizontContainer final : public Container, public gcn::WidgetListener
{
public:
HorizontContainer(const int height, const int spacing);
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 150f34576..62e8ac1b1 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -32,7 +32,7 @@ class Image;
*
* \ingroup GUI
*/
-class Icon : public gcn::Widget
+class Icon final : public gcn::Widget
{
public:
/**
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 0f92692f3..a820de8a3 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -28,7 +28,7 @@
/**
* TextBox which only accepts numbers as input.
*/
-class IntTextField : public TextField
+class IntTextField final : public TextField
{
public:
/**
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index aa254c30b..854d055d2 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -55,7 +55,7 @@
static const int BOX_WIDTH = 35;
static const int BOX_HEIGHT = 43;
-class ItemIdPair
+class ItemIdPair final
{
public:
ItemIdPair(const int id, Item *const item) :
@@ -67,7 +67,7 @@ class ItemIdPair
Item* mItem;
};
-class SortItemAlphaFunctor
+class SortItemAlphaFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -81,7 +81,7 @@ class SortItemAlphaFunctor
}
} itemAlphaSorter;
-class SortItemIdFunctor
+class SortItemIdFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -94,7 +94,7 @@ class SortItemIdFunctor
}
} itemIdSorter;
-class SortItemWeightFunctor
+class SortItemWeightFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -114,7 +114,7 @@ class SortItemWeightFunctor
}
} itemWeightSorter;
-class SortItemAmountFunctor
+class SortItemAmountFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -134,7 +134,7 @@ class SortItemAmountFunctor
}
} itemAmountSorter;
-class SortItemTypeFunctor
+class SortItemTypeFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 02309ebc9..40f9a92d7 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -46,10 +46,10 @@ namespace gcn
*
* \ingroup GUI
*/
-class ItemContainer : public gcn::Widget,
- public gcn::KeyListener,
- public gcn::MouseListener,
- public gcn::WidgetListener
+class ItemContainer final : public gcn::Widget,
+ public gcn::KeyListener,
+ public gcn::MouseListener,
+ public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 9f66da991..5deb76c73 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -27,7 +27,7 @@
class ItemPopup;
-class ItemLinkHandler : public LinkHandler
+class ItemLinkHandler final : public LinkHandler
{
public:
ItemLinkHandler();
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index f5135fbb3..92866b10d 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -37,7 +37,7 @@ class SpellPopup;
*
* \ingroup GUI
*/
-class ItemShortcutContainer : public ShortcutContainer
+class ItemShortcutContainer final : public ShortcutContainer
{
public:
/**
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index f2048c94a..b9845ef0a 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -30,7 +30,7 @@
*
* \ingroup GUI
*/
-class Label : public gcn::Label
+class Label final : public gcn::Label
{
public:
/**
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 71de85320..beccfcb01 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -34,7 +34,7 @@ class LayoutCell;
/**
* This class is a helper for adding widgets to nested tables in a window.
*/
-class ContainerPlacer
+class ContainerPlacer final
{
public:
ContainerPlacer(gcn::Container *c = nullptr, LayoutCell *lc = nullptr):
@@ -67,7 +67,7 @@ class ContainerPlacer
/**
* This class contains a rectangular array of cells.
*/
-class LayoutArray
+class LayoutArray final
{
friend class LayoutCell;
@@ -331,7 +331,7 @@ class LayoutCell
* pixels between rows and between columns, and a margin of 6 pixels around the
* whole layout.
*/
-class Layout : public LayoutCell
+class Layout final : public LayoutCell
{
public:
Layout();
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index c9c5e2471..518168a80 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -32,7 +32,7 @@
* will register itself as a widget listener and relayout the widgets in the
* container dynamically on resize.
*/
-class LayoutHelper : public gcn::WidgetListener
+class LayoutHelper final : public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index e41ed46b8..9ef9f8658 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -25,7 +25,7 @@
#include <guichan/mouseevent.hpp>
#include <guichan/widget.hpp>
-class MouseEvent : public gcn::MouseEvent
+class MouseEvent final : public gcn::MouseEvent
{
public:
MouseEvent(gcn::Widget* source, bool shiftPressed,
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index eca95e6ad..ceb88876e 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -30,7 +30,7 @@
*
* \ingroup GUI
*/
-class PasswordField : public TextField
+class PasswordField final : public TextField
{
public:
/**
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 81fe87f52..dbf104de0 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -38,7 +38,7 @@ class Skin;
*
* \ingroup GUI
*/
-class PlayerBox : public gcn::ScrollArea
+class PlayerBox final : public gcn::ScrollArea
{
public:
/**
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 0b4927cc9..11c8069a3 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -38,7 +38,7 @@ class ImageRect;
*
* \ingroup GUI
*/
-class ProgressBar : public gcn::Widget, public gcn::WidgetListener
+class ProgressBar final : public gcn::Widget, public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 6d55fd3ce..4046f21d9 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -30,7 +30,7 @@ class SimpleAnimation;
* A widget that indicates progress. Suitable to use instead of a progress bar
* in cases where it is unknown how long something is going to take.
*/
-class ProgressIndicator : public gcn::Widget
+class ProgressIndicator final : public gcn::Widget
{
public:
ProgressIndicator();
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 2db41cd78..ae846bc77 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -30,7 +30,7 @@ class Image;
/**
* Guichan based RadioButton with custom look
*/
-class RadioButton : public gcn::RadioButton
+class RadioButton final : public gcn::RadioButton
{
public:
/**
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index fb511971d..19e67d09d 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -25,7 +25,7 @@
#include <guichan/widget.hpp>
-class RadioGroup : public WidgetGroup
+class RadioGroup final : public WidgetGroup
{
public:
RadioGroup(const std::string &group, const int height,
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 870c0eaff..064bfdeb0 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -39,7 +39,7 @@ class ImageRect;
*
* \ingroup GUI
*/
-class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener
+class ScrollArea final : public gcn::ScrollArea, public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index f1ec4d23b..d8affadd1 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -129,7 +129,7 @@ class SetupItem : public gcn::ActionListener
int mValueType;
};
-class SetupItemCheckBox : public SetupItem
+class SetupItemCheckBox final : public SetupItem
{
public:
SetupItemCheckBox(std::string text, std::string description,
@@ -153,7 +153,7 @@ class SetupItemCheckBox : public SetupItem
CheckBox *mCheckBox;
};
-class SetupItemTextField : public SetupItem
+class SetupItemTextField final : public SetupItem
{
public:
SetupItemTextField(std::string text, std::string description,
@@ -186,7 +186,7 @@ class SetupItemTextField : public SetupItem
EditDialog *mEditDialog;
};
-class SetupItemIntTextField : public SetupItem
+class SetupItemIntTextField final : public SetupItem
{
public:
SetupItemIntTextField(std::string text, std::string description,
@@ -225,7 +225,7 @@ class SetupItemIntTextField : public SetupItem
EditDialog *mEditDialog;
};
-class SetupItemLabel : public SetupItem
+class SetupItemLabel final : public SetupItem
{
public:
SetupItemLabel(std::string text, std::string description,
@@ -249,7 +249,7 @@ class SetupItemLabel : public SetupItem
bool mIsSeparator;
};
-class SetupItemDropDown : public SetupItem
+class SetupItemDropDown final : public SetupItem
{
public:
SetupItemDropDown(std::string text, std::string description,
@@ -277,7 +277,7 @@ class SetupItemDropDown : public SetupItem
DropDown *mDropDown;
};
-class SetupItemSlider : public SetupItem
+class SetupItemSlider final : public SetupItem
{
public:
SetupItemSlider(std::string text, std::string description,
@@ -323,7 +323,7 @@ typedef std::vector<std::string> SetupItemNames;
typedef SetupItemNames::iterator SetupItemNamesIter;
typedef SetupItemNames::const_iterator SetupItemNamesConstIter;
-class SetupItemSlider2 : public SetupItem
+class SetupItemSlider2 final : public SetupItem
{
public:
SetupItemSlider2(std::string text, std::string description,
@@ -413,7 +413,7 @@ class SetupItemSliderList : public SetupItem
bool mOnTheFly;
};
-class SetupItemSound : public SetupItemSliderList
+class SetupItemSound final : public SetupItemSliderList
{
public:
SetupItemSound(std::string text, std::string description,
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 038c10093..978926420 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -28,6 +28,8 @@
#include <string>
#include <vector>
+#include "localconsts.h"
+
class ShopItem;
/**
@@ -39,7 +41,7 @@ class ShopItem;
*
* This functionality can be enabled in the constructor.
*/
-class ShopItems : public gcn::ListModel
+class ShopItems final : public gcn::ListModel
{
public:
/**
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index f34c8d772..ed5bfa003 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -35,7 +35,7 @@ class ItemPopup;
*
* \ingroup GUI
*/
-class ShopListBox : public ListBox
+class ShopListBox final : public ListBox
{
public:
/**
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 95d23f83e..494039c73 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -33,7 +33,7 @@ class ImageRect;
*
* \ingroup GUI
*/
-class Slider : public gcn::Slider
+class Slider final : public gcn::Slider
{
public:
/**
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 992316a1b..76dbc012c 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -32,9 +32,9 @@
class Button;
class Label;
-class SliderList : public Container,
- public gcn::ActionListener,
- public gcn::MouseListener
+class SliderList final : public Container,
+ public gcn::ActionListener,
+ public gcn::MouseListener
{
public:
SliderList(gcn::ListModel *const listModel = nullptr,
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 22fe15d95..570b8b263 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -36,7 +36,7 @@ class TextCommand;
*
* \ingroup GUI
*/
-class SpellShortcutContainer : public ShortcutContainer
+class SpellShortcutContainer final : public ShortcutContainer
{
public:
/**
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 0513c2858..a616a9935 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -37,7 +37,7 @@ class Tab;
/**
* A tabbed area, the same as the guichan tabbed area in 0.8, but extended
*/
-class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
+class TabbedArea final : public gcn::TabbedArea, public gcn::WidgetListener
{
public:
/**
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 86acd0cc9..4e3938038 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -26,6 +26,8 @@
#include <set>
#include <vector>
+#include "localconsts.h"
+
namespace gcn
{
class Widget;
@@ -103,7 +105,7 @@ private:
};
-class StaticTableModel : public TableModel
+class StaticTableModel final : public TableModel
{
public:
StaticTableModel(const int width, const int height);
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 92d864b79..fac0fc502 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -26,7 +26,7 @@
#include <guichan/actionevent.hpp>
#include <guichan/widget.hpp>
-class TabStrip : public WidgetGroup
+class TabStrip final : public WidgetGroup
{
public:
TabStrip(const std::string &group, const int height,
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index dcd289a60..a95fd118a 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -32,7 +32,7 @@
*
* \ingroup GUI
*/
-class TextBox : public gcn::TextBox
+class TextBox final : public gcn::TextBox
{
public:
/**
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 06c588215..e116e939b 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -30,7 +30,7 @@
/**
* Preview widget for particle colors, etc.
*/
-class TextPreview : public gcn::Widget
+class TextPreview final : public gcn::Widget
{
public:
TextPreview(const std::string &text);
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h
index 44922c31a..a31376263 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tradetab.h
@@ -28,7 +28,7 @@
/**
* A tab for a party chat channel.
*/
-class TradeTab : public ChatTab
+class TradeTab final : public ChatTab
{
public:
TradeTab();
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index e02d43c24..2c9087db2 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -33,7 +33,7 @@
*
* This container places it's contents veritcally.
*/
-class VertContainer : public Container, public gcn::WidgetListener
+class VertContainer final : public Container, public gcn::WidgetListener
{
public:
VertContainer(const int verticalItemSize, const bool resizable = true,
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index eec66768c..2a8ca1ab0 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -30,7 +30,7 @@ class Channel;
/**
* A tab for whispers from a single player.
*/
-class WhisperTab : public ChatTab
+class WhisperTab final : public ChatTab
{
public:
const std::string &getNick() const