From 4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Feb 2014 15:43:12 +0300
Subject: Move Widget into gui/widgets directory.

---
 src/gui/widgets/tabs/setup_joystick.cpp  | 2 +-
 src/gui/widgets/tabs/setup_relations.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/widgets/tabs')

diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index aa1180cef..e2e66c6fc 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -104,7 +104,7 @@ Setup_Joystick::~Setup_Joystick()
 
 void Setup_Joystick::action(const ActionEvent &event)
 {
-    const gcn::Widget *const source = event.getSource();
+    const Widget *const source = event.getSource();
     if (source == mJoystickEnabled)
     {
         setTempEnabled(mJoystickEnabled->isSelected());
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 30e1c96bd..dd08d437b 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -165,7 +165,7 @@ public:
              player_names->size()); r < sz; ++r)
         {
             const std::string name = (*player_names)[r];
-            gcn::Widget *const widget = new Label(this, name);
+            Widget *const widget = new Label(this, name);
             mWidgets.push_back(widget);
 
             DropDown *const choicebox = new DropDown(this, mListModel);
@@ -186,7 +186,7 @@ public:
     }
 
 
-    gcn::Widget *getElementAt(int row, int column) const override final
+    Widget *getElementAt(int row, int column) const override final
     {
         return mWidgets[WIDGET_AT(row, column)];
     }
@@ -209,7 +209,7 @@ public:
 
 protected:
     StringVect *mPlayers;
-    std::vector<gcn::Widget *> mWidgets;
+    std::vector<Widget *> mWidgets;
     PlayerRelationListModel *mListModel;
 };
 
-- 
cgit v1.2.3-60-g2f50