From b3a0b3dc161face77bfd13791655c79343aab3a8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Feb 2014 16:46:23 +0300 Subject: Move inputevent into events directory. --- src/CMakeLists.txt | 3 +-- src/Makefile.am | 3 +-- src/actionmanager.cpp | 3 ++- src/events/inputevent.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ src/input/inputevent.cpp | 29 ------------------------- src/input/inputevent.h | 51 ------------------------------------------- src/input/inputmanager.h | 3 ++- src/input/joystick.h | 2 +- src/input/keyboardconfig.h | 2 +- src/input/keydata.h | 2 +- 10 files changed, 63 insertions(+), 89 deletions(-) create mode 100644 src/events/inputevent.h delete mode 100644 src/input/inputevent.cpp delete mode 100644 src/input/inputevent.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3b6d15922..3dd27b230 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -658,8 +658,7 @@ SET(SRCS textcommand.h input/inputmanager.cpp input/inputmanager.h - input/inputevent.cpp - input/inputevent.h + events/inputevent.h input/joystick.cpp input/joystick.h input/keyboardconfig.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 98d843fbd..90f09b6f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -773,8 +773,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ spellshortcut.h \ textcommand.cpp \ textcommand.h \ - input/inputevent.cpp \ - input/inputevent.h \ + events/inputevent.h \ input/inputmanager.cpp \ input/inputmanager.h \ input/joystick.cpp \ diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index 5b02e4aba..473e6cbc7 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -31,7 +31,8 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" -#include "input/inputevent.h" +#include "events/inputevent.h" + #include "input/inputmanager.h" #include "gui/sdlinput.h" diff --git a/src/events/inputevent.h b/src/events/inputevent.h new file mode 100644 index 000000000..2d8a36796 --- /dev/null +++ b/src/events/inputevent.h @@ -0,0 +1,54 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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 . + */ + +#ifndef EVENTS_INPUTEVENT_H +#define EVENTS_INPUTEVENT_H + +#include +#include + +#include "localconsts.h" + +typedef std::vector KeysVector; +typedef KeysVector::iterator KeysVectorIter; +typedef KeysVector::const_iterator KeysVectorCIter; + +typedef std::map KeyToActionMap; +typedef KeyToActionMap::iterator KeyToActionMapIter; + +typedef std::map KeyToIdMap; +typedef KeyToIdMap::iterator KeyToIdMapIter; + +typedef std::map KeyTimeMap; +typedef KeyTimeMap::iterator KeyTimeMapIter; + +struct InputEvent final +{ + InputEvent(const int action0, const int mask0) : + action(action0), + mask(mask0) + { } + + int action; + + int mask; +}; + +#endif // EVENTS_INPUTEVENT_H diff --git a/src/input/inputevent.cpp b/src/input/inputevent.cpp deleted file mode 100644 index b87e4fe0a..000000000 --- a/src/input/inputevent.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-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 . - */ - -#include "input/inputevent.h" - -#include "debug.h" - -InputEvent::InputEvent(const int action0, const int mask0) : - action(action0), - mask(mask0) -{ -} diff --git a/src/input/inputevent.h b/src/input/inputevent.h deleted file mode 100644 index 61f80c8e2..000000000 --- a/src/input/inputevent.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-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 . - */ - -#ifndef INPUT_INPUTEVENT_H -#define INPUT_INPUTEVENT_H - -#include -#include - -#include "localconsts.h" - -typedef std::vector KeysVector; -typedef KeysVector::iterator KeysVectorIter; -typedef KeysVector::const_iterator KeysVectorCIter; - -typedef std::map KeyToActionMap; -typedef KeyToActionMap::iterator KeyToActionMapIter; - -typedef std::map KeyToIdMap; -typedef KeyToIdMap::iterator KeyToIdMapIter; - -typedef std::map KeyTimeMap; -typedef KeyTimeMap::iterator KeyTimeMapIter; - -struct InputEvent final -{ - InputEvent(const int action0, const int mask0); - - int action; - - int mask; -}; - -#endif // INPUT_INPUTEVENT_H diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 630b52948..fcd1252c0 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -21,7 +21,8 @@ #ifndef INPUT_INPUTMANAGER_H #define INPUT_INPUTMANAGER_H -#include "input/inputevent.h" +#include "events/inputevent.h" + #include "input/keydata.h" #include diff --git a/src/input/joystick.h b/src/input/joystick.h index 06823ca27..8693d0d75 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -23,7 +23,7 @@ #ifndef INPUT_JOYSTICK_H #define INPUT_JOYSTICK_H -#include "input/inputevent.h" +#include "events/inputevent.h" #include diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h index 7f7102964..425a0c70c 100644 --- a/src/input/keyboardconfig.h +++ b/src/input/keyboardconfig.h @@ -27,7 +27,7 @@ #include "sdlshared.h" -#include "input/inputevent.h" +#include "events/inputevent.h" #include diff --git a/src/input/keydata.h b/src/input/keydata.h index 2ceb957c5..62517b64b 100644 --- a/src/input/keydata.h +++ b/src/input/keydata.h @@ -23,7 +23,7 @@ #ifndef INPUT_KEYDATA_H #define INPUT_KEYDATA_H -#include "input/inputevent.h" +#include "events/inputevent.h" #include -- cgit v1.2.3-70-g09d2