summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-12 15:43:10 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-12 15:44:19 +0300
commitf8fa10233df6c27c70c4a4875b202068654e825a (patch)
treeb42bba419a3fbb5cbd892aba1185383f2790ea8d
parent1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a (diff)
downloadplus-f8fa10233df6c27c70c4a4875b202068654e825a.tar.gz
plus-f8fa10233df6c27c70c4a4875b202068654e825a.tar.bz2
plus-f8fa10233df6c27c70c4a4875b202068654e825a.tar.xz
plus-f8fa10233df6c27c70c4a4875b202068654e825a.zip
Move keyeventtype.h into enum directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/events/keyeventtype.h (renamed from src/events/keyeventtype.h)6
-rw-r--r--src/events/keyevent.h2
-rw-r--r--src/input/keyinput.h2
5 files changed, 7 insertions, 7 deletions
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/events/keyeventtype.h b/src/enums/events/keyeventtype.h
index ecefa3267..7c96b749a 100644
--- a/src/events/keyeventtype.h
+++ b/src/enums/events/keyeventtype.h
@@ -61,8 +61,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EVENTS_KEYEVENTTYPE_H
-#define EVENTS_KEYEVENTTYPE_H
+#ifndef ENUMS_EVENTS_KEYEVENTTYPE_H
+#define ENUMS_EVENTS_KEYEVENTTYPE_H
namespace KeyEventType
{
@@ -76,4 +76,4 @@ namespace KeyEventType
};
} // namespace KeyEventType
-#endif // EVENTS_KEYEVENTTYPE_H
+#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/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"