move keylistener from base into listeners.

19 files changed, 36 insertions, 148 deletions

diff --git a/src/gui/base/gui.cpp b/src/gui/base/gui.cpp
index 73d6ff380..e85a17d97 100644
--- a/src/gui/base/gui.cpp
+++ b/src/gui/base/gui.cpp
@@ -72,11 +72,12 @@
 #include "gui/base/focushandler.hpp"
 #include "gui/base/input.hpp"
 #include "gui/base/keyinput.hpp"
-#include "gui/base/keylistener.hpp"
 #include "gui/base/mouseinput.hpp"
-#include "gui/base/mouselistener.hpp"
 #include "gui/base/widget.hpp"
 
+#include "listeners/keylistener.h"
+#include "gui/base/mouselistener.hpp"
+
 #include "render/graphics.h"
 
 #include "debug.h"
diff --git a/src/gui/base/gui.hpp b/src/gui/base/gui.hpp
index 28a231101..b1d13dcd7 100644
--- a/src/gui/base/gui.hpp
+++ b/src/gui/base/gui.hpp
@@ -72,12 +72,12 @@
 #include "gui/base/mouseinput.hpp"
 
 class Graphics;
+class KeyListener;
 
 namespace gcn
 {
     class FocusHandler;
     class Input;
-    class KeyListener;
     class Widget;
 
     // The following comment will appear in the doxygen main page.
diff --git a/src/gui/base/keylistener.hpp b/src/gui/base/keylistener.hpp
deleted file mode 100644
index 088a937a6..000000000
--- a/src/gui/base/keylistener.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_KEYLISTENER_HPP
-#define GCN_KEYLISTENER_HPP
-
-#include "gui/base/keyevent.hpp"
-
-#include "localconsts.h"
-
-namespace gcn
-{
-    class Key;
-
-    /**
-     * Interface for listening for key events from widgets.
-     *
-     * @see Widget::addKeyListener, Widget::removeKeyListener
-     */
-    class KeyListener
-    {
-    public:
-        /**
-         * Destructor.
-         */
-        virtual ~KeyListener()
-        { }
-
-        /**
-         * Called if a key is pressed when the widget has keyboard focus.
-         * If a key is held down the widget will generate multiple key
-         * presses.
-         *
-         * @param keyEvent Discribes the event.
-         */
-        virtual void keyPressed(KeyEvent& keyEvent A_UNUSED)
-        { }
-
-        /**
-         * Called if a key is released when the widget has keyboard focus.
-         *
-         * @param keyEvent Discribes the event.
-         */
-        virtual void keyReleased(KeyEvent& keyEvent A_UNUSED)
-        { }
-
-    protected:
-        /**
-         * Constructor.
-         *
-         * You should not be able to make an instance of KeyListener,
-         * therefore its constructor is protected.
-         */
-        KeyListener()
-        { }
-    };
-}  // namespace gcn
-
-#endif  // end GCN_KEYLISTENER_HPP
diff --git a/src/gui/base/widget.cpp b/src/gui/base/widget.cpp
index b9a98ff1c..c72a06e8b 100644
--- a/src/gui/base/widget.cpp
+++ b/src/gui/base/widget.cpp
@@ -74,12 +74,12 @@
 #include "gui/base/exception.hpp"
 #include "gui/base/focushandler.hpp"
 #include "gui/base/keyinput.hpp"
-#include "gui/base/keylistener.hpp"
 #include "gui/base/mouseinput.hpp"
-#include "gui/base/mouselistener.hpp"
-#include "gui/base/widgetlistener.hpp"
 
 #include "listeners/deathlistener.h"
+#include "listeners/keylistener.h"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/base/widget.hpp b/src/gui/base/widget.hpp
index a6dc2ed13..583ade076 100644
--- a/src/gui/base/widget.hpp
+++ b/src/gui/base/widget.hpp
@@ -77,6 +77,7 @@ class ActionListener;
 class DeathListener;
 class FocusListener;
 class Graphics;
+class KeyListener;
 
 namespace gcn
 {
@@ -84,7 +85,6 @@ namespace gcn
     class FocusHandler;
     class Font;
     class KeyInput;
-    class KeyListener;
     class MouseInput;
     class MouseListener;
     class WidgetListener;
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 82ff878a0..4631ed80f 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -82,7 +82,7 @@ namespace gcn
     Button::Button() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         FocusListener(),
         mCaption(),
         mHasMouse(false),
@@ -103,7 +103,7 @@ namespace gcn
     Button::Button(const std::string& caption) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         FocusListener(),
         mCaption(caption),
         mHasMouse(false),
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index e2d6c0c8e..779a75aa5 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -67,7 +67,7 @@
 #include <string>
 
 #include "listeners/focuslistener.h"
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
 
 #include "gui/base/mouseevent.hpp"
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index 615808a85..ceb59a1eb 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -81,7 +81,7 @@ namespace gcn
     CheckBox::CheckBox() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(false),
         mCaption()
     {
@@ -93,7 +93,7 @@ namespace gcn
     CheckBox::CheckBox(const std::string &caption, bool selected) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(selected),
         mCaption()
     {
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
index c9b723879..4904a022f 100644
--- a/src/gui/base/widgets/checkbox.hpp
+++ b/src/gui/base/widgets/checkbox.hpp
@@ -66,8 +66,9 @@
 
 #include <string>
 
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
+
 #include "gui/base/widget.hpp"
 
 namespace gcn
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index dcf443c77..771f22f64 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -83,7 +83,7 @@ namespace gcn
     ListBox::ListBox() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(-1),
         mListModel(nullptr),
         mWrappingEnabled(false),
@@ -99,7 +99,7 @@ namespace gcn
     ListBox::ListBox(ListModel *listModel) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(-1),
         mListModel(listModel),
         mWrappingEnabled(false),
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index f2780f130..11983262f 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -66,11 +66,12 @@
 
 #include <list>
 
-#include "gui/base/keylistener.hpp"
 #include "gui/base/listmodel.hpp"
-#include "gui/base/mouselistener.hpp"
 #include "gui/base/widget.hpp"
 
+#include "listeners/keylistener.h"
+#include "gui/base/mouselistener.hpp"
+
 namespace gcn
 {
     class SelectionListener;
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index 1e1da2622..f7145fd55 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -82,7 +82,7 @@ namespace gcn
     RadioButton::RadioButton() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(false),
         mCaption(),
         mGroup()
@@ -99,7 +99,7 @@ namespace gcn
                              bool selected) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mSelected(false),
         mCaption(),
         mGroup()
diff --git a/src/gui/base/widgets/radiobutton.hpp b/src/gui/base/widgets/radiobutton.hpp
index 07e3d656a..98b562676 100644
--- a/src/gui/base/widgets/radiobutton.hpp
+++ b/src/gui/base/widgets/radiobutton.hpp
@@ -67,8 +67,9 @@
 #include <map>
 #include <string>
 
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
+
 #include "gui/base/widget.hpp"
 
 namespace gcn
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index e9ab36e86..2a3fb8c24 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -79,7 +79,7 @@ namespace gcn
     Slider::Slider(const double scaleEnd) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mDragged(false),
         mValue(0),
         mStepLength(scaleEnd / 10),
@@ -98,7 +98,7 @@ namespace gcn
     Slider::Slider(const double scaleStart, const double scaleEnd) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mDragged(false),
         mValue(scaleStart),
         mStepLength((scaleEnd - scaleStart) / 10),
diff --git a/src/gui/base/widgets/slider.hpp b/src/gui/base/widgets/slider.hpp
index 32cdfefb9..fa047a739 100644
--- a/src/gui/base/widgets/slider.hpp
+++ b/src/gui/base/widgets/slider.hpp
@@ -64,8 +64,9 @@
 #ifndef GCN_SLIDER_HPP
 #define GCN_SLIDER_HPP
 
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
+
 #include "gui/base/widget.hpp"
 
 namespace gcn
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index 411fc7dd5..c146c4f08 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -81,7 +81,7 @@ namespace gcn
     TextBox::TextBox() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mTextRows(),
         mCaretColumn(0),
         mCaretRow(0),
@@ -99,7 +99,7 @@ namespace gcn
     TextBox::TextBox(const std::string& text) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mTextRows(),
         mCaretColumn(0),
         mCaretRow(0),
diff --git a/src/gui/base/widgets/textbox.hpp b/src/gui/base/widgets/textbox.hpp
index 0a540a2c1..894616360 100644
--- a/src/gui/base/widgets/textbox.hpp
+++ b/src/gui/base/widgets/textbox.hpp
@@ -68,8 +68,9 @@
 #include <string>
 #include <vector>
 
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
+
 #include "gui/base/widget.hpp"
 
 namespace gcn
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 3349ebccb..178a012b7 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -80,7 +80,7 @@ namespace gcn
     TextField::TextField() :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mText(),
         mCaretPosition(0),
         mXScroll(0)
@@ -94,7 +94,7 @@ namespace gcn
     TextField::TextField(const std::string& text) :
         gcn::Widget(),
         gcn::MouseListener(),
-        gcn::KeyListener(),
+        KeyListener(),
         mText(text),
         mCaretPosition(0),
         mXScroll(0)
diff --git a/src/gui/base/widgets/textfield.hpp b/src/gui/base/widgets/textfield.hpp
index bc227eb55..56d60b7aa 100644
--- a/src/gui/base/widgets/textfield.hpp
+++ b/src/gui/base/widgets/textfield.hpp
@@ -64,8 +64,9 @@
 #ifndef GCN_TEXTFIELD_HPP
 #define GCN_TEXTFIELD_HPP
 
-#include "gui/base/keylistener.hpp"
+#include "listeners/keylistener.h"
 #include "gui/base/mouselistener.hpp"
+
 #include "gui/base/widget.hpp"
 
 #include <string>