Restructure source tree

porymap.pro

@@ -0,0 +1,90 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-08-31T15:19:13
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = porymap
+TEMPLATE = app
+RC_ICONS = resources/icons/porymap-icon-1.ico
+ICON = resources/icons/porymap-icon-1.ico
+
+
+SOURCES += src/core/block.cpp \
+    src/core/blockdata.cpp \
+    src/core/event.cpp \
+    src/core/heallocation.cpp \
+    src/core/historyitem.cpp \
+    src/core/map.cpp \
+    src/core/maplayout.cpp \
+    src/core/metatile.cpp \
+    src/core/parseutil.cpp \
+    src/core/tile.cpp \
+    src/core/tileset.cpp \
+    src/ui/bordermetatilespixmapitem.cpp \
+    src/ui/collisionpixmapitem.cpp \
+    src/ui/connectionpixmapitem.cpp \
+    src/ui/currentselectedmetatilespixmapitem.cpp \
+    src/ui/eventpropertiesframe.cpp \
+    src/ui/graphicsview.cpp \
+    src/ui/imageproviders.cpp \
+    src/ui/mappixmapitem.cpp \
+    src/ui/mapsceneeventfilter.cpp \
+    src/ui/metatileselector.cpp \
+    src/ui/movementpermissionsselector.cpp \
+    src/ui/neweventtoolbutton.cpp \
+    src/ui/noscrollcombobox.cpp \
+    src/ui/noscrollspinbox.cpp \
+    src/ui/selectablepixmapitem.cpp \
+    src/editor.cpp \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/project.cpp \
+    src/settings.cpp
+
+HEADERS  += include/core/block.h \
+    include/core/blockdata.h \
+    include/core/event.h \
+    include/core/heallocation.h \
+    include/core/history.h \
+    include/core/historyitem.h \
+    include/core/map.h \
+    include/core/mapconnection.h \
+    include/core/maplayout.h \
+    include/core/metatile.h \
+    include/core/parseutil.h \
+    include/core/tile.h \
+    include/core/tileset.h \
+    include/ui/bordermetatilespixmapitem.h \
+    include/ui/collisionpixmapitem.h \
+    include/ui/connectionpixmapitem.h \
+    include/ui/currentselectedmetatilespixmapitem.h \
+    include/ui/eventpropertiesframe.h \
+    include/ui/graphicsview.h \
+    include/ui/imageproviders.h \
+    include/ui/mappixmapitem.h \
+    include/ui/mapsceneeventfilter.h \
+    include/ui/metatileselector.h \
+    include/ui/movementpermissionsselector.h \
+    include/ui/neweventtoolbutton.h \
+    include/ui/noscrollcombobox.h \
+    include/ui/noscrollspinbox.h \
+    include/ui/selectablepixmapitem.h \
+    include/editor.h \
+    include/mainwindow.h \
+    include/project.h \
+    include/settings.h
+
+FORMS    += forms/mainwindow.ui \
+    forms/eventpropertiesframe.ui
+
+RESOURCES += \
+    resources/images.qrc
+
+INCLUDEPATH += include
+INCLUDEPATH += include/core
+INCLUDEPATH += include/ui

src/porymap.pro

@@ -1,89 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-08-31T15:19:13
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = porymap
-TEMPLATE = app
-RC_ICONS = resources/icons/porymap-icon-1.ico
-ICON = resources/icons/porymap-icon-1.ico
-
-
-SOURCES += core/block.cpp \
-    core/blockdata.cpp \
-    core/event.cpp \
-    core/heallocation.cpp \
-    core/historyitem.cpp \
-    core/map.cpp \
-    core/maplayout.cpp \
-    core/metatile.cpp \
-    core/parseutil.cpp \
-    core/tile.cpp \
-    core/tileset.cpp \
-    ui/bordermetatilespixmapitem.cpp \
-    ui/collisionpixmapitem.cpp \
-    ui/connectionpixmapitem.cpp \
-    ui/currentselectedmetatilespixmapitem.cpp \
-    ui/eventpropertiesframe.cpp \
-    ui/graphicsview.cpp \
-    ui/imageproviders.cpp \
-    ui/mappixmapitem.cpp \
-    ui/metatileselector.cpp \
-    ui/movementpermissionsselector.cpp \
-    ui/neweventtoolbutton.cpp \
-    ui/noscrollcombobox.cpp \
-    ui/noscrollspinbox.cpp \
-    ui/selectablepixmapitem.cpp \
-    editor.cpp \
-    main.cpp \
-    mainwindow.cpp \
-    project.cpp \
-    settings.cpp \
-    ui/mapsceneeventfilter.cpp
-
-HEADERS  += core/block.h \
-    core/blockdata.h \
-    core/event.h \
-    core/heallocation.h \
-    core/history.h \
-    core/historyitem.h \
-    core/map.h \
-    core/mapconnection.h \
-    core/maplayout.h \
-    core/metatile.h \
-    core/parseutil.h \
-    core/tile.h \
-    core/tileset.h \
-    ui/bordermetatilespixmapitem.h \
-    ui/collisionpixmapitem.h \
-    ui/connectionpixmapitem.h \
-    ui/currentselectedmetatilespixmapitem.h \
-    ui/eventpropertiesframe.h \
-    ui/graphicsview.h \
-    ui/imageproviders.h \
-    ui/mappixmapitem.h \
-    ui/metatileselector.h \
-    ui/movementpermissionsselector.h \
-    ui/neweventtoolbutton.h \
-    ui/noscrollcombobox.h \
-    ui/noscrollspinbox.h \
-    ui/selectablepixmapitem.h \
-    editor.h \
-    mainwindow.h \
-    project.h \
-    settings.h \
-    ui/mapsceneeventfilter.h
-
-FORMS    += mainwindow.ui \
-    eventpropertiesframe.ui
-
-RESOURCES += \
-    resources/images.qrc
-
-INCLUDEPATH += core
-INCLUDEPATH += ui

src/ui/mapsceneeventfilter.cpp

@@ -7,7 +7,7 @@ MapSceneEventFilter::MapSceneEventFilter(QObject *parent) : QObject(parent)
 
 }
 
-bool MapSceneEventFilter::eventFilter(QObject *obj, QEvent *event)
+bool MapSceneEventFilter::eventFilter(QObject*, QEvent *event)
 {
     if (event->type() == QEvent::GraphicsSceneWheel)
     {