summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 23:58:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 23:58:22 +0300
commit768523601ff80a23bf3e821484cc116c62498a38 (patch)
tree45bcf588111d58755b78cfd900db0b8cdfaecdea /src/gui/widgets
parent01d93aedcc4d1632ff5915c3989a502ec31cd978 (diff)
downloadmv-768523601ff80a23bf3e821484cc116c62498a38.tar.gz
mv-768523601ff80a23bf3e821484cc116c62498a38.tar.bz2
mv-768523601ff80a23bf3e821484cc116c62498a38.tar.xz
mv-768523601ff80a23bf3e821484cc116c62498a38.zip
move keylistener from base into listeners.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/dropdown.cpp2
-rw-r--r--src/gui/widgets/dropdown.h7
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/guitable.h5
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.h7
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.h5
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_video.h4
10 files changed, 20 insertions, 18 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 0e9241f21..e4e38aa90 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -58,7 +58,7 @@ DropDown::DropDown(const Widget2 *const widget,
const std::string &eventId):
ActionListener(),
gcn::BasicContainer(),
- gcn::KeyListener(),
+ KeyListener(),
gcn::MouseListener(),
FocusListener(),
gcn::SelectionListener(),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ca0743ae7..525ce83e3 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -28,13 +28,12 @@
#include "gui/base/basiccontainer.hpp"
#include "gui/base/listmodel.hpp"
+#include "listeners/actionlistener.h"
#include "listeners/focuslistener.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
#include "gui/base/selectionlistener.hpp"
-#include "listeners/actionlistener.h"
-
#include "localconsts.h"
class Image;
@@ -53,7 +52,7 @@ class Skin;
*/
class DropDown final : public ActionListener,
public gcn::BasicContainer,
- public gcn::KeyListener,
+ public KeyListener,
public gcn::MouseListener,
public FocusListener,
public gcn::SelectionListener,
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index e2af7f16d..fff2416bf 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -97,7 +97,7 @@ GuiTable::GuiTable(const Widget2 *const widget,
gcn::Widget(),
Widget2(widget),
gcn::MouseListener(),
- gcn::KeyListener(),
+ KeyListener(),
mModel(nullptr),
mTopWidget(nullptr),
mActionListeners(),
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 2154d0889..8d551de2b 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -28,8 +28,9 @@
#include "gui/widgets/tablemodel.h"
#include "gui/widgets/widget2.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
+
#include "gui/base/widget.hpp"
#include <vector>
@@ -48,7 +49,7 @@ class GuiTableActionListener;
class GuiTable final : public gcn::Widget,
public Widget2,
public gcn::MouseListener,
- public gcn::KeyListener,
+ public KeyListener,
public TableModelListener
{
// so that the action listener can call distributeActionEvent
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 0913dcae3..4fa8a2705 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -160,7 +160,7 @@ ItemContainer::ItemContainer(const Widget2 *const widget,
const bool forceQuantity) :
gcn::Widget(),
Widget2(widget),
- gcn::KeyListener(),
+ KeyListener(),
gcn::MouseListener(),
gcn::WidgetListener(),
mInventory(inventory),
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index cfacb05c6..7757fa65c 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -25,11 +25,12 @@
#include "gui/widgets/widget2.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
-#include "gui/base/widget.hpp"
#include "gui/base/widgetlistener.hpp"
+#include "gui/base/widget.hpp"
+
#include <list>
#include "localconsts.h"
@@ -51,7 +52,7 @@ namespace gcn
*/
class ItemContainer final : public gcn::Widget,
public Widget2,
- public gcn::KeyListener,
+ public KeyListener,
public gcn::MouseListener,
public gcn::WidgetListener
{
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index d659cd6b6..8841560e2 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -37,7 +37,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
Widget2(widget),
ActionListener(),
gcn::BasicContainer(),
- gcn::KeyListener(),
+ KeyListener(),
gcn::MouseListener(),
gcn::WidgetListener(),
mSelectedTab(nullptr),
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index af7fe5429..03a9f6868 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -25,9 +25,10 @@
#include "gui/widgets/widget2.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
#include "gui/base/mouselistener.hpp"
#include "gui/base/widgetlistener.hpp"
+
#include "gui/base/widgets/container.hpp"
#include "listeners/actionlistener.h"
@@ -42,7 +43,7 @@ class Tab;
class TabbedArea final : public Widget2,
public ActionListener,
public gcn::BasicContainer,
- public gcn::KeyListener,
+ public KeyListener,
public gcn::MouseListener,
public gcn::WidgetListener
{
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index f35f75413..ffadc5d03 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -178,7 +178,7 @@ public:
Setup_Video::Setup_Video(const Widget2 *const widget) :
SetupTab(widget),
- gcn::KeyListener(),
+ KeyListener(),
mFullScreenEnabled(config.getBoolValue("screen")),
mOpenGLEnabled(intToRenderType(config.getIntValue("opengl"))),
mFps(config.getIntValue("fpslimit")),
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index 25ecfabd6..facbcbce3 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -25,7 +25,7 @@
#include "gui/widgets/tabs/setuptab.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
class Button;
class CheckBox;
@@ -37,7 +37,7 @@ class OpenGLListModel;
class Slider;
class TextDialog;
-class Setup_Video final : public SetupTab, public gcn::KeyListener
+class Setup_Video final : public SetupTab, public KeyListener
{
public:
explicit Setup_Video(const Widget2 *const widget);