Move event to core/

core/block.cpp

@@ -1,4 +1,4 @@
-#include "core/block.h"
+#include "block.h"
 
 Block::Block() {
 }

core/blockdata.cpp

@@ -1,4 +1,4 @@
-#include "core/blockdata.h"
+#include "blockdata.h"
 
 Blockdata::Blockdata(QObject *parent) : QObject(parent)
 {

core/event.h

@@ -1,7 +1,7 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "core/heallocation.h"
+#include "heallocation.h"
 #include <QString>
 #include <QPixmap>
 #include <QMap>

core/metatile.cpp

@@ -1,6 +1,6 @@
-#include "core/metatile.h"
+#include "metatile.h"
+#include "tileset.h"
 #include "project.h"
-#include "core/tileset.h"
 
 Metatile::Metatile()
 {

core/parseutil.h

@@ -1,7 +1,7 @@
 #ifndef PARSEUTIL_H
 #define PARSEUTIL_H
 
-#include "core/heallocation.h"
+#include "heallocation.h"
 
 #include <QString>
 #include <QList>

core/tile.cpp

@@ -1,4 +1,4 @@
-#include "core/tile.h"
+#include "tile.h"
 
 Tile::Tile()
 {

core/tileset.cpp

@@ -1,5 +1,5 @@
-#include "core/tileset.h"
+#include "tileset.h"
-#include "core/metatile.h"
+#include "metatile.h"
 #include "project.h"
 
 #include <QPainter>

core/tileset.h

@@ -1,8 +1,8 @@
 #ifndef TILESET_H
 #define TILESET_H
 
-#include "core/metatile.h"
+#include "metatile.h"
-#include "core/tile.h"
+#include "tile.h"
 #include <QImage>
 
 class Tileset

editor.cpp

@@ -1,6 +1,6 @@
 #include "editor.h"
 #include "event.h"
-#include "core/mapconnection.h"
+#include "mapconnection.h"
 #include <QCheckBox>
 #include <QPainter>
 #include <QMouseEvent>

editor.h

@@ -9,9 +9,9 @@
 #include <QCheckBox>
 #include <QCursor>
 
-#include "core/mapconnection.h"
+#include "mapconnection.h"
-#include "ui/metatileselector.h"
+#include "metatileselector.h"
-#include "ui/movementpermissionsselector.h"
+#include "movementpermissionsselector.h"
 #include "project.h"
 #include "ui_mainwindow.h"
 

mainwindow.cpp

@@ -2,7 +2,7 @@
 #include "ui_mainwindow.h"
 #include "project.h"
 #include "editor.h"
-#include "ui/eventpropertiesframe.h"
+#include "eventpropertiesframe.h"
 #include "ui_objectpropertiesframe.h"
 
 #include <QDebug>

map.cpp

@@ -1,5 +1,5 @@
-#include "core/history.h"
+#include "history.h"
-#include "core/historyitem.h"
+#include "historyitem.h"
 #include "map.h"
 #include "project.h"
 

map.h

@@ -1,12 +1,12 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "core/blockdata.h"
+#include "blockdata.h"
-#include "core/history.h"
+#include "history.h"
-#include "core/historyitem.h"
+#include "historyitem.h"
-#include "core/mapconnection.h"
+#include "mapconnection.h"
-#include "core/maplayout.h"
+#include "maplayout.h"
-#include "core/tileset.h"
+#include "tileset.h"
 #include "event.h"
 
 #include <QPixmap>

porymap.pro

@@ -16,6 +16,7 @@ ICON = resources/icons/porymap-icon-1.ico
 
 SOURCES += core/block.cpp \
     core/blockdata.cpp \
+    core/event.cpp \
     core/heallocation.cpp \
     core/historyitem.cpp \
     core/maplayout.cpp \
@@ -31,7 +32,6 @@ SOURCES += core/block.cpp \
     ui/noscrollspinbox.cpp \
     ui/selectablepixmapitem.cpp \
     editor.cpp \
-    event.cpp \
     graphicsview.cpp \
     main.cpp \
     mainwindow.cpp \
@@ -40,6 +40,7 @@ SOURCES += core/block.cpp \
 
 HEADERS  += core/block.h \
     core/blockdata.h \
+    core/event.h \
     core/heallocation.h \
     core/history.h \
     core/historyitem.h \
@@ -57,7 +58,6 @@ HEADERS  += core/block.h \
     ui/noscrollspinbox.h \
     ui/selectablepixmapitem.h \
     editor.h \
-    event.h \
     graphicsview.h \
     mainwindow.h \
     map.h \

project.cpp

@@ -1,9 +1,9 @@
 #include "project.h"
-#include "core/history.h"
+#include "history.h"
-#include "core/historyitem.h"
+#include "historyitem.h"
-#include "core/parseutil.h"
+#include "parseutil.h"
-#include "core/tile.h"
+#include "tile.h"
-#include "core/tileset.h"
+#include "tileset.h"
 #include "event.h"
 
 #include <QDebug>

project.h

@@ -2,8 +2,8 @@
 #define PROJECT_H
 
 #include "map.h"
-#include "core/blockdata.h"
+#include "blockdata.h"
-#include "core/heallocation.h"
+#include "heallocation.h"
 
 #include <QStringList>
 #include <QList>

ui/metatileselector.h

@@ -2,7 +2,7 @@
 #define METATILESELECTOR_H
 
 #include "selectablepixmapitem.h"
-#include "core/tileset.h"
+#include "tileset.h"
 
 class MetatileSelector: public SelectablePixmapItem {
     Q_OBJECT