diff options
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/keyevent.h | 17 | ||||
| -rw-r--r-- | src/events/keyeventtype.h | 79 |
2 files changed, 84 insertions, 12 deletions
diff --git a/src/events/keyevent.h b/src/events/keyevent.h index 16bc707c1..03e85438e 100644 --- a/src/events/keyevent.h +++ b/src/events/keyevent.h @@ -64,7 +64,9 @@ #ifndef EVENTS_KEYEVENT_H #define EVENTS_KEYEVENT_H +#include "events/keyeventtype.h" #include "events/inputguievent.h" + #include "input/key.h" #include <string> @@ -78,15 +80,6 @@ class KeyEvent: public InputGuiEvent { public: /** - * Key event types. - */ - enum - { - PRESSED = 0, - RELEASED - }; - - /** * Constructor. * * @param source The source widget of the event. @@ -95,7 +88,7 @@ class KeyEvent: public InputGuiEvent * @param key The key of the event. */ KeyEvent(Widget *const source, - const unsigned int type, + KeyEventType::Type type, const int actionId, const Key &key) : InputGuiEvent(source), @@ -118,7 +111,7 @@ class KeyEvent: public InputGuiEvent * * @return The type of the event. */ - unsigned int getType() const A_WARN_UNUSED + KeyEventType::Type getType() const A_WARN_UNUSED { return mType; } /** @@ -153,7 +146,7 @@ class KeyEvent: public InputGuiEvent /** * Holds the type of the key event. */ - unsigned int mType; + KeyEventType::Type mType; int mActionId; }; diff --git a/src/events/keyeventtype.h b/src/events/keyeventtype.h new file mode 100644 index 000000000..a53231ced --- /dev/null +++ b/src/events/keyeventtype.h @@ -0,0 +1,79 @@ +/* + * 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 EVENTS_KEYEVENTTYPE_H +#define EVENTS_KEYEVENTTYPE_H + +namespace KeyEventType +{ + /** + * Key event types. + */ + enum Type + { + PRESSED = 0, + RELEASED + }; +} // namespace KeyEventType + +#endif // EVENTS_KEYEVENTTYPE_H |