Add missing notfinal/final to classes.

26 files changed, 48 insertions, 48 deletions

diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h
index 2bbd64878..b6630ee47 100644
--- a/src/gui/models/avatarlistmodel.h
+++ b/src/gui/models/avatarlistmodel.h
@@ -28,7 +28,7 @@
 
 #include <string>
 
-class AvatarListModel : public ListModel
+class AvatarListModel notfinal : public ListModel
 {
     public:
         virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 068da0dd9..058eed4eb 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -32,7 +32,7 @@
 class Color;
 class Widget2;
 
-class ColorModel : public ListModel
+class ColorModel final : public ListModel
 {
     public:
         ColorModel();
diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index 5d859e781..4edfebc3b 100644
--- a/src/gui/models/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -25,7 +25,7 @@
 
 #include "gui/models/listmodel.h"
 
-class ExtendedListModel : public ListModel
+class ExtendedListModel notfinal : public ListModel
 {
     public:
         virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0;
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index 383a93951..7acaf65c6 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -25,7 +25,7 @@
 
 #include "gui/models/extendedlistmodel.h"
 
-class ExtendedNamesModel : public ExtendedListModel
+class ExtendedNamesModel notfinal : public ExtendedListModel
 {
     public:
         ExtendedNamesModel();
diff --git a/src/gui/models/namesmodel.h b/src/gui/models/namesmodel.h
index 96d16de36..59bb947e9 100644
--- a/src/gui/models/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -27,7 +27,7 @@
 
 #include "localconsts.h"
 
-class NamesModel : public ListModel
+class NamesModel notfinal : public ListModel
 {
     public:
         NamesModel();
diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h
index b7de67cff..2db290e70 100644
--- a/src/gui/models/typelistmodel.h
+++ b/src/gui/models/typelistmodel.h
@@ -27,7 +27,7 @@
 /**
  * Server Type List Model
  */
-class TypeListModel : public ListModel
+class TypeListModel final : public ListModel
 {
     public:
         TypeListModel()
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index 8a5d7b9a4..85067daff 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -78,8 +78,8 @@
   * @see Container
   * @since 0.6.0
   */
-class BasicContainer : public Widget,
-                       public DeathListener
+class BasicContainer notfinal : public Widget,
+                                public DeathListener
 {
     public:
         explicit BasicContainer(const Widget2 *const widget) :
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index 16b6c3e0d..6c0fd9434 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -29,8 +29,8 @@
 
 #include "localconsts.h"
 
-class CharacterViewBase : public Container,
-                          public ActionListener
+class CharacterViewBase notfinal : public Container,
+                                   public ActionListener
 {
     public:
         A_DELETE_COPY(CharacterViewBase)
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 262d7327a..7252a0ed7 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -34,7 +34,7 @@
  *
  * This container is also non-opaque by default.
  */
-class Container : public BasicContainer2
+class Container notfinal : public BasicContainer2
 {
     public:
         explicit Container(const Widget2 *const widget);
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index e425b48ca..d6cd12ddc 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -89,9 +89,9 @@ class Widget2;
  *
  * \ingroup GUI
  */
-class ListBox : public Widget,
-                public MouseListener,
-                public KeyListener
+class ListBox notfinal : public Widget,
+                         public MouseListener,
+                         public KeyListener
 {
     public:
         /**
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 5067b4658..eb26dd4b3 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -45,9 +45,9 @@ class WindowContainer;
  *
  * \ingroup GUI
  */
-class Popup : public Container,
-              public MouseListener,
-              public WidgetListener
+class Popup notfinal : public Container,
+                       public MouseListener,
+                       public WidgetListener
 {
     public:
         /**
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 03681ad90..849ca5fd1 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -42,8 +42,8 @@ class Slider;
 class SliderList;
 class TextField;
 
-class SetupItem : public ActionListener,
-                  public Widget2
+class SetupItem notfinal : public ActionListener,
+                           public Widget2
 {
     public:
         enum
@@ -462,7 +462,7 @@ class SetupItemSlider2 final : public SetupItem
         bool mDoNotAlign;
 };
 
-class SetupItemSliderList : public SetupItem
+class SetupItemSliderList notfinal : public SetupItem
 {
     public:
         A_DELETE_COPY(SetupItemSliderList)
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index d4d4ac4bf..6ef3af452 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -36,9 +36,9 @@ class ImageCollection;
  *
  * \ingroup GUI
  */
-class ShortcutContainer : public Widget,
-                          public WidgetListener,
-                          public MouseListener
+class ShortcutContainer notfinal : public Widget,
+                                   public WidgetListener,
+                                   public MouseListener
 {
     public:
         A_DELETE_COPY(ShortcutContainer)
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index 1cc755907..93797a8c1 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -36,7 +36,7 @@
 class Button;
 class LayoutHelper;
 
-class AttrDisplay : public Container
+class AttrDisplay notfinal : public Container
 {
     public:
         enum Type
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index b22074623..6f0f042b7 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -36,7 +36,7 @@ class ScrollArea;
 /**
  * A tab for the chat window. This is special to ease chat handling.
  */
-class ChatTab : public Tab
+class ChatTab notfinal : public Tab
 {
     public:
         /**
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index 4230bc09a..d44fe8dc4 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.h
+++ b/src/gui/widgets/tabs/debugwindowtabs.h
@@ -27,7 +27,7 @@
 
 class Label;
 
-class DebugTab : public Container
+class DebugTab notfinal : public Container
 {
     friend class DebugWindow;
 
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 4d6049b6a..2f03e0e92 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -35,9 +35,9 @@
 /**
  * A container for the contents of a tab in the setup window.
  */
-class SetupTab : public Container,
-                 public ActionListener,
-                 public WidgetListener
+class SetupTab notfinal : public Container,
+                          public ActionListener,
+                          public WidgetListener
 {
     public:
         A_DELETE_COPY(SetupTab)
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index f7aa628c9..dec56c13e 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -32,7 +32,7 @@ class SetupItem;
 class ScrollArea;
 class VertContainer;
 
-class SetupTabScroll : public SetupTab
+class SetupTabScroll notfinal : public SetupTab
 {
     public:
         explicit SetupTabScroll(const Widget2 *const widget);
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 31fb5d938..57bf03d95 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -36,7 +36,7 @@
 
 class AvatarListModel;
 
-class SocialTab : public Tab
+class SocialTab notfinal : public Tab
 {
     public:
         A_DELETE_COPY(SocialTab)
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 4a88a5400..610181471 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -81,9 +81,9 @@ class TabbedArea;
 /**
  * A tab, the same as the Guichan tab in 0.8, but extended
  */
-class Tab : public BasicContainer,
-            public MouseListener,
-            public WidgetListener
+class Tab notfinal : public BasicContainer,
+                     public MouseListener,
+                     public WidgetListener
 {
     public:
         explicit Tab(const Widget2 *const widget);
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 1af5978b1..d2cdcd473 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -81,10 +81,10 @@ class PopupMenu;
  *
  * \ingroup GUI
  */
-class TextField : public Widget,
-                  public FocusListener,
-                  public KeyListener,
-                  public MouseListener
+class TextField notfinal : public Widget,
+                           public FocusListener,
+                           public KeyListener,
+                           public MouseListener
 {
     public:
         /**
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index f3e2fdb66..8109d142d 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -96,7 +96,7 @@ class WidgetListener;
   * @author Per Larsson.
   * @since 0.1.0
   */
-class Widget : public Widget2
+class Widget notfinal : public Widget2
 {
     public:
         friend class BasicContainer;
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 051234cda..384eab284 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -28,9 +28,9 @@
 
 #include "localconsts.h"
 
-class WidgetGroup : public Container,
-                    public WidgetListener,
-                    public ActionListener
+class WidgetGroup notfinal : public Container,
+                             public WidgetListener,
+                             public ActionListener
 {
     public:
         A_DELETE_COPY(WidgetGroup)
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index fea0883cf..4fedf69ac 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -90,9 +90,9 @@ class WindowContainer;
  *
  * \ingroup GUI
  */
-class Window : public BasicContainer2,
-               public MouseListener,
-               private WidgetListener
+class Window notfinal : public BasicContainer2,
+                        public MouseListener,
+                        public WidgetListener
 {
     public:
         /**
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index a822fadb5..9b4328128 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -33,7 +33,7 @@
  *
  * \ingroup GUI
  */
-class WindowContainer : public Container
+class WindowContainer notfinal : public Container
 {
     public:
         explicit WindowContainer(const Widget2 *const widget);
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 0d9f25d38..56054ee19 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -38,8 +38,8 @@ class TextBox;
  *
  * \ingroup GUI
  */
-class ConfirmDialog : public Window,
-                      public ActionListener
+class ConfirmDialog notfinal : public Window,
+                               public ActionListener
 {
     public:
         /**