Move inputevent into events directory.

6 files changed, 5 insertions, 84 deletions

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 <http://www.gnu.org/licenses/>.
- */
-
-#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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INPUT_INPUTEVENT_H
-#define INPUT_INPUTEVENT_H
-
-#include <map>
-#include <vector>
-
-#include "localconsts.h"
-
-typedef std::vector<int> KeysVector;
-typedef KeysVector::iterator KeysVectorIter;
-typedef KeysVector::const_iterator KeysVectorCIter;
-
-typedef std::map<int, KeysVector> KeyToActionMap;
-typedef KeyToActionMap::iterator KeyToActionMapIter;
-
-typedef std::map<int, int> KeyToIdMap;
-typedef KeyToIdMap::iterator KeyToIdMapIter;
-
-typedef std::map<int, int> 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 <string>
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 <SDL_events.h>
 
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 <string>
 
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 <string>