From f8fa10233df6c27c70c4a4875b202068654e825a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 12 Jan 2015 15:43:10 +0300 Subject: Move keyeventtype.h into enum directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/events/keyeventtype.h | 79 +++++++++++++++++++++++++++++++++++++++++ src/events/keyevent.h | 2 +- src/events/keyeventtype.h | 79 ----------------------------------------- src/input/keyinput.h | 2 +- 6 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 src/enums/events/keyeventtype.h delete mode 100644 src/events/keyeventtype.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d805ff267..c7ca70954 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1116,7 +1116,7 @@ SET(SRCS events/inputguievent.h input/key.h events/keyevent.h - events/keyeventtype.h + enums/events/keyeventtype.h listeners/keylistener.h gui/models/listmodel.h gui/models/magicschoolmodel.h diff --git a/src/Makefile.am b/src/Makefile.am index 0d0d84594..fe244fd56 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,7 +195,7 @@ manaplus_SOURCES += events/actionevent.h \ events/inputguievent.h \ input/key.h \ events/keyevent.h \ - events/keyeventtype.h \ + enums/events/keyeventtype.h \ listeners/keylistener.h \ gui/models/listmodel.h \ gui/models/magicschoolmodel.h \ diff --git a/src/enums/events/keyeventtype.h b/src/enums/events/keyeventtype.h new file mode 100644 index 000000000..7c96b749a --- /dev/null +++ b/src/enums/events/keyeventtype.h @@ -0,0 +1,79 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2015 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 . + */ + +/* _______ __ __ __ ______ __ __ _______ __ __ + * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ + * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / + * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / + * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / + * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / + * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ + * + * 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 ENUMS_EVENTS_KEYEVENTTYPE_H +#define ENUMS_EVENTS_KEYEVENTTYPE_H + +namespace KeyEventType +{ + /** + * Key event types. + */ + enum Type + { + PRESSED = 0, + RELEASED + }; +} // namespace KeyEventType + +#endif // ENUMS_EVENTS_KEYEVENTTYPE_H diff --git a/src/events/keyevent.h b/src/events/keyevent.h index 86f916c1b..3cad1bce2 100644 --- a/src/events/keyevent.h +++ b/src/events/keyevent.h @@ -64,7 +64,7 @@ #ifndef EVENTS_KEYEVENT_H #define EVENTS_KEYEVENT_H -#include "events/keyeventtype.h" +#include "enums/events/keyeventtype.h" #include "events/inputguievent.h" #include "input/key.h" diff --git a/src/events/keyeventtype.h b/src/events/keyeventtype.h deleted file mode 100644 index ecefa3267..000000000 --- a/src/events/keyeventtype.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2015 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 . - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * 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 diff --git a/src/input/keyinput.h b/src/input/keyinput.h index d80001c33..775ef98dd 100644 --- a/src/input/keyinput.h +++ b/src/input/keyinput.h @@ -64,7 +64,7 @@ #ifndef INPUT_KEYINPUT_H #define INPUT_KEYINPUT_H -#include "events/keyeventtype.h" +#include "enums/events/keyeventtype.h" #include "input/key.h" -- cgit v1.2.3-60-g2f50