From 9bca06b1c7c121f410766ad99b91075902ce24c7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Feb 2014 00:36:17 +0300
Subject: move selectionlistener from base into listeners.

---
 src/gui/widgets/dropdown.cpp          |  2 +-
 src/gui/widgets/dropdown.h            |  4 ++--
 src/gui/widgets/itemcontainer.cpp     |  2 +-
 src/gui/widgets/itemcontainer.h       | 12 ++++--------
 src/gui/widgets/tabs/setup_colors.cpp |  2 +-
 src/gui/widgets/tabs/setup_colors.h   |  4 ++--
 6 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index efb3235a4..1aed0dfe1 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -61,7 +61,7 @@ DropDown::DropDown(const Widget2 *const widget,
     KeyListener(),
     MouseListener(),
     FocusListener(),
-    gcn::SelectionListener(),
+    SelectionListener(),
     Widget2(widget),
     mPopup(new PopupList(this, listModel, extended, modal)),
     mShadowColor(getThemeColor(Theme::DROPDOWN_SHADOW)),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 7d645a478..692b341ca 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -32,7 +32,7 @@
 #include "listeners/focuslistener.h"
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
-#include "gui/base/selectionlistener.hpp"
+#include "listeners/selectionlistener.h"
 
 #include "localconsts.h"
 
@@ -55,7 +55,7 @@ class DropDown final : public ActionListener,
                        public KeyListener,
                        public MouseListener,
                        public FocusListener,
-                       public gcn::SelectionListener,
+                       public SelectionListener,
                        public Widget2
 {
     public:
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 40c87d272..036cb6c1b 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -47,7 +47,7 @@
 #include "resources/image.h"
 
 #include "gui/base/font.hpp"
-#include "gui/base/selectionlistener.hpp"
+#include "listeners/selectionlistener.h"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 77d7e1c28..74ae72a23 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -39,11 +39,7 @@ class Image;
 class Inventory;
 class Item;
 class ItemPopup;
-
-namespace gcn
-{
-    class SelectionListener;
-}
+class SelectionListener;
 
 /**
  * An item container. Used to show items in inventory and trade dialog.
@@ -116,14 +112,14 @@ class ItemContainer final : public gcn::Widget,
          * Adds a listener to the list that's notified each time a change to
          * the selection occurs.
          */
-        void addSelectionListener(gcn::SelectionListener *listener)
+        void addSelectionListener(SelectionListener *listener)
         { mSelectionListeners.push_back(listener); }
 
         /**
          * Removes a listener from the list that's notified each time a change
          * to the selection occurs.
          */
-        void removeSelectionListener(gcn::SelectionListener *listener)
+        void removeSelectionListener(SelectionListener *listener)
         { mSelectionListeners.remove(listener); }
 
         void setFilter(const int tag);
@@ -192,7 +188,7 @@ class ItemContainer final : public gcn::Widget,
         gcn::Color mEquipedColor2;
         gcn::Color mUnEquipedColor;
         gcn::Color mUnEquipedColor2;
-        typedef std::list<gcn::SelectionListener*> SelectionListenerList;
+        typedef std::list<SelectionListener*> SelectionListenerList;
         typedef SelectionListenerList::iterator SelectionListenerIterator;
         SelectionListenerList mSelectionListeners;
         int mGridColumns;
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 1094f5e29..fadea948a 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -47,7 +47,7 @@ const char *const Setup_Colors::rawmsg =
 
 Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     SetupTab(widget),
-    gcn::SelectionListener(),
+    SelectionListener(),
     mColorBox(new ListBox(this, userPalette, "")),
     mScroll(new ScrollArea(mColorBox, true, "setup_colors_background.xml")),
     mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index 38f0f2687..0bcc9c7f0 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include "gui/base/selectionlistener.hpp"
+#include "listeners/selectionlistener.h"
 
 #include <string>
 
@@ -37,7 +37,7 @@ class TextField;
 class TextPreview;
 
 class Setup_Colors final : public SetupTab,
-                           public gcn::SelectionListener
+                           public SelectionListener
 {
     public:
         explicit Setup_Colors(const Widget2 *const widget);
-- 
cgit v1.2.3-60-g2f50