move mouselistener from base into listeners.

18 files changed, 29 insertions, 28 deletions

diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 4631ed80f..7f1aea668 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -81,7 +81,7 @@ namespace gcn
 {
     Button::Button() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         FocusListener(),
         mCaption(),
@@ -102,7 +102,7 @@ namespace gcn
 
     Button::Button(const std::string& caption) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         FocusListener(),
         mCaption(caption),
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index 779a75aa5..c81fec14f 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -68,7 +68,7 @@
 
 #include "listeners/focuslistener.h"
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/mouseevent.hpp"
 #include "gui/base/widget.hpp"
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index ceb59a1eb..5f2477b4d 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -80,7 +80,7 @@ namespace gcn
 
     CheckBox::CheckBox() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(false),
         mCaption()
@@ -92,7 +92,7 @@ namespace gcn
 
     CheckBox::CheckBox(const std::string &caption, bool selected) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(selected),
         mCaption()
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index 4904a022f..c03187bba 100644
--- a/src/gui/base/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -67,7 +67,7 @@
 #include <string>
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/widget.hpp"
 
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 771f22f64..3ae4caa91 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -82,7 +82,7 @@ namespace gcn
 {
     ListBox::ListBox() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(-1),
         mListModel(nullptr),
@@ -98,7 +98,7 @@ namespace gcn
 
     ListBox::ListBox(ListModel *listModel) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(-1),
         mListModel(listModel),
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index 11983262f..793aba840 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -70,7 +70,7 @@
 #include "gui/base/widget.hpp"
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index f7145fd55..e42773de1 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -81,7 +81,7 @@ namespace gcn
 
     RadioButton::RadioButton() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(false),
         mCaption(),
@@ -98,7 +98,7 @@ namespace gcn
                              const std::string &group,
                              bool selected) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mSelected(false),
         mCaption(),
diff --git a/src/gui/base/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index 98b562676..8a9a8b585 100644
--- a/src/gui/base/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -68,7 +68,7 @@
 #include <string>
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/widget.hpp"
 
diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp
index 308cee473..ffcaffdb1 100644
--- a/src/gui/base/widgets/scrollarea.cpp
+++ b/src/gui/base/widgets/scrollarea.cpp
@@ -77,7 +77,7 @@ namespace gcn
 {
     ScrollArea::ScrollArea() :
         gcn::BasicContainer(),
-        gcn::MouseListener(),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
@@ -104,7 +104,7 @@ namespace gcn
 
     ScrollArea::ScrollArea(Widget *const content) :
         gcn::BasicContainer(),
-        gcn::MouseListener(),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
@@ -134,7 +134,7 @@ namespace gcn
                            ScrollPolicy hPolicy,
                            ScrollPolicy vPolicy) :
         gcn::BasicContainer(),
-        gcn::MouseListener(),
+        MouseListener(),
         mVScroll(0),
         mHScroll(0),
         mScrollbarWidth(12),
diff --git a/src/gui/base/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp
index e75390ec0..1d4c0dd54 100644
--- a/src/gui/base/widgets/scrollarea.hpp
+++ b/src/gui/base/widgets/scrollarea.hpp
@@ -67,7 +67,7 @@
 #include <string>
 
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index 2a3fb8c24..91c054e7d 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -78,7 +78,7 @@ namespace gcn
 {
     Slider::Slider(const double scaleEnd) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mDragged(false),
         mValue(0),
@@ -97,7 +97,7 @@ namespace gcn
 
     Slider::Slider(const double scaleStart, const double scaleEnd) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mDragged(false),
         mValue(scaleStart),
diff --git a/src/gui/base/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp
index fa047a739..f77d3f5dd 100644
--- a/src/gui/base/widgets/slider.hpp
+++ b/src/gui/base/widgets/slider.hpp
@@ -65,7 +65,7 @@
 #define GCN_SLIDER_HPP
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/widget.hpp"
 
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index c146c4f08..06d0e6379 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -80,7 +80,7 @@ namespace gcn
 {
     TextBox::TextBox() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mTextRows(),
         mCaretColumn(0),
@@ -98,7 +98,7 @@ namespace gcn
 
     TextBox::TextBox(const std::string& text) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mTextRows(),
         mCaretColumn(0),
diff --git a/src/gui/base/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index 894616360..8fc788816 100644
--- a/src/gui/base/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -69,7 +69,7 @@
 #include <vector>
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/widget.hpp"
 
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 178a012b7..df1b844d4 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -79,7 +79,7 @@ namespace gcn
 {
     TextField::TextField() :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mText(),
         mCaretPosition(0),
@@ -93,7 +93,7 @@ namespace gcn
 
     TextField::TextField(const std::string& text) :
         gcn::Widget(),
-        gcn::MouseListener(),
+        MouseListener(),
         KeyListener(),
         mText(text),
         mCaretPosition(0),
diff --git a/src/gui/base/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp
index 56d60b7aa..099ed1356 100644
--- a/src/gui/base/widgets/textfield.hpp
+++ b/src/gui/base/widgets/textfield.hpp
@@ -65,7 +65,7 @@
 #define GCN_TEXTFIELD_HPP
 
 #include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
 
 #include "gui/base/widget.hpp"
 
diff --git a/src/gui/base/widgets/window.cpp b/src/gui/base/widgets/window.cpp
index 6373bcb63..02611f819 100644
--- a/src/gui/base/widgets/window.cpp
+++ b/src/gui/base/widgets/window.cpp
@@ -79,7 +79,7 @@ namespace gcn
 {
     Window::Window() :
         Container(),
-        gcn::MouseListener(),
+        MouseListener(),
         mCaption(),
         mAlignment(Graphics::CENTER),
         mPadding(2),
@@ -96,7 +96,7 @@ namespace gcn
 
     Window::Window(const std::string& caption) :
         Container(),
-        gcn::MouseListener(),
+        MouseListener(),
         mCaption(caption),
         mAlignment(Graphics::CENTER),
         mPadding(2),
diff --git a/src/gui/base/widgets/window.hpp b/src/gui/base/widgets/window.hpp
index 9c7e6bcbf..030d57edc 100644
--- a/src/gui/base/widgets/window.hpp
+++ b/src/gui/base/widgets/window.hpp
@@ -66,7 +66,8 @@
 
 #include <string>
 
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
+
 #include "gui/base/widgets/container.hpp"
 
 namespace gcn