summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 16:46:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 16:46:23 +0300
commitb3a0b3dc161face77bfd13791655c79343aab3a8 (patch)
treefa2363339be5fc92aea1972c1f1a377a66d88890 /src
parent374005f4a84fd447fb6679a138b37c780d6e8b5d (diff)
downloadManaVerse-b3a0b3dc161face77bfd13791655c79343aab3a8.tar.gz
ManaVerse-b3a0b3dc161face77bfd13791655c79343aab3a8.tar.bz2
ManaVerse-b3a0b3dc161face77bfd13791655c79343aab3a8.tar.xz
ManaVerse-b3a0b3dc161face77bfd13791655c79343aab3a8.zip
Move inputevent into events directory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/Makefile.am3
-rw-r--r--src/actionmanager.cpp3
-rw-r--r--src/events/inputevent.h (renamed from src/input/inputevent.h)11
-rw-r--r--src/input/inputevent.cpp29
-rw-r--r--src/input/inputmanager.h3
-rw-r--r--src/input/joystick.h2
-rw-r--r--src/input/keyboardconfig.h2
-rw-r--r--src/input/keydata.h2
9 files changed, 16 insertions, 42 deletions
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/input/inputevent.h b/src/events/inputevent.h
index 61f80c8e2..2d8a36796 100644
--- a/src/input/inputevent.h
+++ b/src/events/inputevent.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INPUT_INPUTEVENT_H
-#define INPUT_INPUTEVENT_H
+#ifndef EVENTS_INPUTEVENT_H
+#define EVENTS_INPUTEVENT_H
#include <map>
#include <vector>
@@ -41,11 +41,14 @@ typedef KeyTimeMap::iterator KeyTimeMapIter;
struct InputEvent final
{
- InputEvent(const int action0, const int mask0);
+ InputEvent(const int action0, const int mask0) :
+ action(action0),
+ mask(mask0)
+ { }
int action;
int mask;
};
-#endif // INPUT_INPUTEVENT_H
+#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 <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/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>