Move Widget into gui/widgets directory.

16 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 5187c625b..2d6afa672 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -76,7 +76,7 @@
 namespace gcn
 {
     Button::Button(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         FocusListener(),
@@ -98,7 +98,7 @@ namespace gcn
 
     Button::Button(const Widget2 *const widget,
                    const std::string& caption) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         FocusListener(),
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index fea175362..99e5db4f4 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -70,7 +70,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index a5ec72dfa..476fb3c6b 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -73,7 +73,7 @@ namespace gcn
 {
 
     CheckBox::CheckBox(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(false),
@@ -87,7 +87,7 @@ namespace gcn
     CheckBox::CheckBox(const Widget2 *const widget,
                        const std::string &caption,
                        bool selected) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(selected),
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index c79ccaff9..6fcb04767 100644
--- a/src/gui/base/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -69,7 +69,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/label.cpp b/src/gui/base/widgets/label.cpp
index 84ba87d84..d2293a957 100644
--- a/src/gui/base/widgets/label.cpp
+++ b/src/gui/base/widgets/label.cpp
@@ -76,7 +76,7 @@
 namespace gcn
 {
     Label::Label(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         mCaption(),
         mAlignment(Graphics::LEFT)
     {
@@ -84,7 +84,7 @@ namespace gcn
 
     Label::Label(const Widget2 *const widget,
                  const std::string& caption) :
-        gcn::Widget(widget),
+        Widget(widget),
         mCaption(caption),
         mAlignment(Graphics::LEFT)
     {
diff --git a/src/gui/base/widgets/label.hpp b/src/gui/base/widgets/label.hpp
index 399e4202a..fd0d54f8e 100644
--- a/src/gui/base/widgets/label.hpp
+++ b/src/gui/base/widgets/label.hpp
@@ -66,7 +66,7 @@
 
 #include <string>
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 765878834..9aca373b9 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -78,7 +78,7 @@
 namespace gcn
 {
     ListBox::ListBox(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(-1),
@@ -95,7 +95,7 @@ namespace gcn
 
     ListBox::ListBox(const Widget2 *const widget,
                      ListModel *listModel) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(-1),
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index c46aca6ae..4046f5ddf 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -66,7 +66,7 @@
 
 #include <list>
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index e17b9f776..f9d68555a 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -74,7 +74,7 @@ namespace gcn
     RadioButton::GroupMap RadioButton::mGroupMap;
 
     RadioButton::RadioButton(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(false),
@@ -92,7 +92,7 @@ namespace gcn
                              const std::string &caption,
                              const std::string &group,
                              bool selected) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mSelected(false),
diff --git a/src/gui/base/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index f4bfd53fa..a86a4eed3 100644
--- a/src/gui/base/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -70,7 +70,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index 4e9df0341..40c73ceb5 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -73,7 +73,7 @@ namespace gcn
 {
     Slider::Slider(const Widget2 *const widget,
                    const double scaleEnd) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mDragged(false),
@@ -94,7 +94,7 @@ namespace gcn
     Slider::Slider(const Widget2 *const widget,
                    const double scaleStart,
                    const double scaleEnd) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mDragged(false),
diff --git a/src/gui/base/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp
index f29ad5950..9d5adc6d8 100644
--- a/src/gui/base/widgets/slider.hpp
+++ b/src/gui/base/widgets/slider.hpp
@@ -67,7 +67,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index bb22a6f46..04b506c59 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -76,7 +76,7 @@
 namespace gcn
 {
     TextBox::TextBox(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mTextRows(),
@@ -95,7 +95,7 @@ namespace gcn
 
     TextBox::TextBox(const Widget2 *const widget,
                      const std::string& text) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mTextRows(),
diff --git a/src/gui/base/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index 151af8c00..148b4f007 100644
--- a/src/gui/base/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -70,7 +70,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 namespace gcn
 {
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index ddcbec1b4..c2cead500 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -74,7 +74,7 @@
 namespace gcn
 {
     TextField::TextField(const Widget2 *const widget) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mText(),
@@ -89,7 +89,7 @@ namespace gcn
 
     TextField::TextField(const Widget2 *const widget,
                          const std::string& text) :
-        gcn::Widget(widget),
+        Widget(widget),
         MouseListener(),
         KeyListener(),
         mText(text),
diff --git a/src/gui/base/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp
index aa5f210c5..e9df238ba 100644
--- a/src/gui/base/widgets/textfield.hpp
+++ b/src/gui/base/widgets/textfield.hpp
@@ -67,7 +67,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "gui/base/widget.hpp"
+#include "gui/widgets/widget.h"
 
 #include <string>