From 9e3f92a3914e28ce01331d7df7d03c31244a843b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Feb 2014 13:30:46 +0300
Subject: move keyevent into events directory.
---
src/gui/base/gui.hpp | 2 +-
src/gui/base/keyevent.cpp | 111 --------------------------------
src/gui/base/keyevent.hpp | 157 ----------------------------------------------
3 files changed, 1 insertion(+), 269 deletions(-)
delete mode 100644 src/gui/base/keyevent.cpp
delete mode 100644 src/gui/base/keyevent.hpp
(limited to 'src/gui/base')
diff --git a/src/gui/base/gui.hpp b/src/gui/base/gui.hpp
index b1d13dcd7..5198b066a 100644
--- a/src/gui/base/gui.hpp
+++ b/src/gui/base/gui.hpp
@@ -67,7 +67,7 @@
#include <list>
#include <deque>
-#include "gui/base/keyevent.hpp"
+#include "events/keyevent.h"
#include "gui/base/mouseevent.hpp"
#include "gui/base/mouseinput.hpp"
diff --git a/src/gui/base/keyevent.cpp b/src/gui/base/keyevent.cpp
deleted file mode 100644
index d8d954bf3..000000000
--- a/src/gui/base/keyevent.cpp
+++ /dev/null
@@ -1,111 +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.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "gui/base/keyevent.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
- KeyEvent::KeyEvent(Widget *const source,
- const bool shiftPressed,
- const bool controlPressed,
- const bool altPressed,
- const bool metaPressed,
- const unsigned int type,
- const bool numericPad,
- const Key& key) :
- InputGuiEvent(source,
- shiftPressed,
- controlPressed,
- altPressed,
- metaPressed),
- mType(type),
- mIsNumericPad(numericPad),
- mKey(key)
- {
- }
-
- KeyEvent::~KeyEvent()
- {
- }
-
- unsigned int KeyEvent::getType() const
- {
- return mType;
- }
-
- bool KeyEvent::isNumericPad() const
- {
- return mIsNumericPad;
- }
-
- const Key& KeyEvent::getKey() const
- {
- return mKey;
- }
-} // namespace gcn
diff --git a/src/gui/base/keyevent.hpp b/src/gui/base/keyevent.hpp
deleted file mode 100644
index dd2b5f296..000000000
--- a/src/gui/base/keyevent.hpp
+++ /dev/null
@@ -1,157 +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_KEYEVENT_HPP
-#define GCN_KEYEVENT_HPP
-
-#include "events/inputguievent.h"
-#include "gui/base/key.hpp"
-
-namespace gcn
-{
- class Widget;
-
- /**
- * Represents a key event.
- */
- class KeyEvent: public InputGuiEvent
- {
- public:
- /**
- * Key event types.
- */
- enum
- {
- PRESSED = 0,
- RELEASED
- };
-
- /**
- * Constructor.
- *
- * @param source The source widget of the event.
- * @param shiftPressed True if shift is pressed, false otherwise.
- * @param controlPressed True if control is pressed, false otherwise.
- * @param altPressed True if alt is pressed, false otherwise.
- * @param metaPressed True if meta is pressed, false otherwise.
- * @param type The type of the event. A value from KeyEventType.
- * @param numericPad True if the event occured on the numeric pad,
- * false otherwise.
- * @param key The key of the event.
- */
- KeyEvent(Widget *const source,
- const bool shiftPressed,
- const bool controlPressed,
- const bool altPressed,
- const bool metaPressed,
- const unsigned int type,
- const bool numericPad,
- const Key& key);
-
- /**
- * Destructor.
- */
- virtual ~KeyEvent();
-
- /**
- * Gets the type of the event.
- *
- * @return The type of the event.
- */
- unsigned int getType() const A_WARN_UNUSED;
-
- /**
- * Checks if the key event occured on the numeric pad.
- *
- * @return True if key event occured on the numeric pad,
- * false otherwise.
- *
- */
- bool isNumericPad() const A_WARN_UNUSED;
-
- /**
- * Gets the key of the event.
- *
- * @return The key of the event.
- */
- const Key& getKey() const A_WARN_UNUSED;
-
- protected:
- /**
- * Holds the type of the key event.
- */
- unsigned int mType;
-
- /**
- * True if the numeric pad was used, false otherwise.
- */
- bool mIsNumericPad;
-
- /**
- * Holds the key of the key event.
- */
- Key mKey;
- };
-} // namespace gcn
-
-#endif // end GCN_KEYEVENT_HPP
--
cgit v1.2.3-70-g09d2