From 497f069d2082a69c75efced90a924e3bd0855352 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 29 Sep 2018 09:10:23 -0500 Subject: [PATCH] Restructure source tree --- {src => forms}/eventpropertiesframe.ui | 0 {src => forms}/mainwindow.ui | 0 {src => include}/core/block.h | 0 {src => include}/core/blockdata.h | 0 {src => include}/core/event.h | 0 {src => include}/core/heallocation.h | 0 {src => include}/core/history.h | 0 {src => include}/core/historyitem.h | 0 {src => include}/core/map.h | 0 {src => include}/core/mapconnection.h | 0 {src => include}/core/maplayout.h | 0 {src => include}/core/metatile.h | 0 {src => include}/core/parseutil.h | 0 {src => include}/core/tile.h | 0 {src => include}/core/tileset.h | 0 {src => include}/editor.h | 0 {src => include}/mainwindow.h | 0 {src => include}/project.h | 0 {src => include}/settings.h | 0 .../ui/bordermetatilespixmapitem.h | 0 {src => include}/ui/collisionpixmapitem.h | 0 {src => include}/ui/connectionpixmapitem.h | 0 .../ui/currentselectedmetatilespixmapitem.h | 0 {src => include}/ui/eventpropertiesframe.h | 0 {src => include}/ui/graphicsview.h | 0 {src => include}/ui/imageproviders.h | 0 {src => include}/ui/mappixmapitem.h | 0 {src => include}/ui/mapsceneeventfilter.h | 0 {src => include}/ui/metatileselector.h | 0 .../ui/movementpermissionsselector.h | 0 {src => include}/ui/neweventtoolbutton.h | 0 {src => include}/ui/noscrollcombobox.h | 0 {src => include}/ui/noscrollspinbox.h | 0 {src => include}/ui/selectablepixmapitem.h | 0 porymap.pro | 90 ++++++++++++++++++ {src/resources => resources}/icons/add.ico | Bin {src/resources => resources}/icons/cursor.ico | Bin {src/resources => resources}/icons/delete.ico | Bin .../icons/fill_color.ico | Bin .../icons/fill_color_cursor.ico | Bin {src/resources => resources}/icons/folder.ico | Bin .../icons/folder_closed.ico | Bin .../icons/folder_closed_map.ico | Bin .../icons/folder_image.ico | Bin .../icons/folder_map.ico | Bin {src/resources => resources}/icons/image.ico | Bin {src/resources => resources}/icons/map.ico | Bin {src/resources => resources}/icons/move.ico | Bin {src/resources => resources}/icons/pencil.ico | Bin .../icons/pencil_cursor.ico | Bin .../resources => resources}/icons/pipette.ico | Bin .../icons/pipette_cursor.ico | Bin .../icons/porymap-icon-1.ico | Bin {src/resources => resources}/icons/shift.ico | Bin .../icons/shift_cursor.ico | Bin .../icons/viewsprites.ico | Bin {src/resources => resources}/images.qrc | 0 .../images/Entities_16x16.png | Bin .../images/collisions.png | Bin src/porymap.pro | 89 ----------------- src/ui/mapsceneeventfilter.cpp | 2 +- 61 files changed, 91 insertions(+), 90 deletions(-) rename {src => forms}/eventpropertiesframe.ui (100%) rename {src => forms}/mainwindow.ui (100%) rename {src => include}/core/block.h (100%) rename {src => include}/core/blockdata.h (100%) rename {src => include}/core/event.h (100%) rename {src => include}/core/heallocation.h (100%) rename {src => include}/core/history.h (100%) rename {src => include}/core/historyitem.h (100%) rename {src => include}/core/map.h (100%) rename {src => include}/core/mapconnection.h (100%) rename {src => include}/core/maplayout.h (100%) rename {src => include}/core/metatile.h (100%) rename {src => include}/core/parseutil.h (100%) rename {src => include}/core/tile.h (100%) rename {src => include}/core/tileset.h (100%) rename {src => include}/editor.h (100%) rename {src => include}/mainwindow.h (100%) rename {src => include}/project.h (100%) rename {src => include}/settings.h (100%) rename {src => include}/ui/bordermetatilespixmapitem.h (100%) rename {src => include}/ui/collisionpixmapitem.h (100%) rename {src => include}/ui/connectionpixmapitem.h (100%) rename {src => include}/ui/currentselectedmetatilespixmapitem.h (100%) rename {src => include}/ui/eventpropertiesframe.h (100%) rename {src => include}/ui/graphicsview.h (100%) rename {src => include}/ui/imageproviders.h (100%) rename {src => include}/ui/mappixmapitem.h (100%) rename {src => include}/ui/mapsceneeventfilter.h (100%) rename {src => include}/ui/metatileselector.h (100%) rename {src => include}/ui/movementpermissionsselector.h (100%) rename {src => include}/ui/neweventtoolbutton.h (100%) rename {src => include}/ui/noscrollcombobox.h (100%) rename {src => include}/ui/noscrollspinbox.h (100%) rename {src => include}/ui/selectablepixmapitem.h (100%) create mode 100644 porymap.pro rename {src/resources => resources}/icons/add.ico (100%) rename {src/resources => resources}/icons/cursor.ico (100%) rename {src/resources => resources}/icons/delete.ico (100%) rename {src/resources => resources}/icons/fill_color.ico (100%) rename {src/resources => resources}/icons/fill_color_cursor.ico (100%) rename {src/resources => resources}/icons/folder.ico (100%) rename {src/resources => resources}/icons/folder_closed.ico (100%) rename {src/resources => resources}/icons/folder_closed_map.ico (100%) rename {src/resources => resources}/icons/folder_image.ico (100%) rename {src/resources => resources}/icons/folder_map.ico (100%) rename {src/resources => resources}/icons/image.ico (100%) rename {src/resources => resources}/icons/map.ico (100%) rename {src/resources => resources}/icons/move.ico (100%) rename {src/resources => resources}/icons/pencil.ico (100%) rename {src/resources => resources}/icons/pencil_cursor.ico (100%) rename {src/resources => resources}/icons/pipette.ico (100%) rename {src/resources => resources}/icons/pipette_cursor.ico (100%) rename {src/resources => resources}/icons/porymap-icon-1.ico (100%) rename {src/resources => resources}/icons/shift.ico (100%) rename {src/resources => resources}/icons/shift_cursor.ico (100%) rename {src/resources => resources}/icons/viewsprites.ico (100%) rename {src/resources => resources}/images.qrc (100%) rename {src/resources => resources}/images/Entities_16x16.png (100%) rename {src/resources => resources}/images/collisions.png (100%) delete mode 100644 src/porymap.pro diff --git a/src/eventpropertiesframe.ui b/forms/eventpropertiesframe.ui similarity index 100% rename from src/eventpropertiesframe.ui rename to forms/eventpropertiesframe.ui diff --git a/src/mainwindow.ui b/forms/mainwindow.ui similarity index 100% rename from src/mainwindow.ui rename to forms/mainwindow.ui diff --git a/src/core/block.h b/include/core/block.h similarity index 100% rename from src/core/block.h rename to include/core/block.h diff --git a/src/core/blockdata.h b/include/core/blockdata.h similarity index 100% rename from src/core/blockdata.h rename to include/core/blockdata.h diff --git a/src/core/event.h b/include/core/event.h similarity index 100% rename from src/core/event.h rename to include/core/event.h diff --git a/src/core/heallocation.h b/include/core/heallocation.h similarity index 100% rename from src/core/heallocation.h rename to include/core/heallocation.h diff --git a/src/core/history.h b/include/core/history.h similarity index 100% rename from src/core/history.h rename to include/core/history.h diff --git a/src/core/historyitem.h b/include/core/historyitem.h similarity index 100% rename from src/core/historyitem.h rename to include/core/historyitem.h diff --git a/src/core/map.h b/include/core/map.h similarity index 100% rename from src/core/map.h rename to include/core/map.h diff --git a/src/core/mapconnection.h b/include/core/mapconnection.h similarity index 100% rename from src/core/mapconnection.h rename to include/core/mapconnection.h diff --git a/src/core/maplayout.h b/include/core/maplayout.h similarity index 100% rename from src/core/maplayout.h rename to include/core/maplayout.h diff --git a/src/core/metatile.h b/include/core/metatile.h similarity index 100% rename from src/core/metatile.h rename to include/core/metatile.h diff --git a/src/core/parseutil.h b/include/core/parseutil.h similarity index 100% rename from src/core/parseutil.h rename to include/core/parseutil.h diff --git a/src/core/tile.h b/include/core/tile.h similarity index 100% rename from src/core/tile.h rename to include/core/tile.h diff --git a/src/core/tileset.h b/include/core/tileset.h similarity index 100% rename from src/core/tileset.h rename to include/core/tileset.h diff --git a/src/editor.h b/include/editor.h similarity index 100% rename from src/editor.h rename to include/editor.h diff --git a/src/mainwindow.h b/include/mainwindow.h similarity index 100% rename from src/mainwindow.h rename to include/mainwindow.h diff --git a/src/project.h b/include/project.h similarity index 100% rename from src/project.h rename to include/project.h diff --git a/src/settings.h b/include/settings.h similarity index 100% rename from src/settings.h rename to include/settings.h diff --git a/src/ui/bordermetatilespixmapitem.h b/include/ui/bordermetatilespixmapitem.h similarity index 100% rename from src/ui/bordermetatilespixmapitem.h rename to include/ui/bordermetatilespixmapitem.h diff --git a/src/ui/collisionpixmapitem.h b/include/ui/collisionpixmapitem.h similarity index 100% rename from src/ui/collisionpixmapitem.h rename to include/ui/collisionpixmapitem.h diff --git a/src/ui/connectionpixmapitem.h b/include/ui/connectionpixmapitem.h similarity index 100% rename from src/ui/connectionpixmapitem.h rename to include/ui/connectionpixmapitem.h diff --git a/src/ui/currentselectedmetatilespixmapitem.h b/include/ui/currentselectedmetatilespixmapitem.h similarity index 100% rename from src/ui/currentselectedmetatilespixmapitem.h rename to include/ui/currentselectedmetatilespixmapitem.h diff --git a/src/ui/eventpropertiesframe.h b/include/ui/eventpropertiesframe.h similarity index 100% rename from src/ui/eventpropertiesframe.h rename to include/ui/eventpropertiesframe.h diff --git a/src/ui/graphicsview.h b/include/ui/graphicsview.h similarity index 100% rename from src/ui/graphicsview.h rename to include/ui/graphicsview.h diff --git a/src/ui/imageproviders.h b/include/ui/imageproviders.h similarity index 100% rename from src/ui/imageproviders.h rename to include/ui/imageproviders.h diff --git a/src/ui/mappixmapitem.h b/include/ui/mappixmapitem.h similarity index 100% rename from src/ui/mappixmapitem.h rename to include/ui/mappixmapitem.h diff --git a/src/ui/mapsceneeventfilter.h b/include/ui/mapsceneeventfilter.h similarity index 100% rename from src/ui/mapsceneeventfilter.h rename to include/ui/mapsceneeventfilter.h diff --git a/src/ui/metatileselector.h b/include/ui/metatileselector.h similarity index 100% rename from src/ui/metatileselector.h rename to include/ui/metatileselector.h diff --git a/src/ui/movementpermissionsselector.h b/include/ui/movementpermissionsselector.h similarity index 100% rename from src/ui/movementpermissionsselector.h rename to include/ui/movementpermissionsselector.h diff --git a/src/ui/neweventtoolbutton.h b/include/ui/neweventtoolbutton.h similarity index 100% rename from src/ui/neweventtoolbutton.h rename to include/ui/neweventtoolbutton.h diff --git a/src/ui/noscrollcombobox.h b/include/ui/noscrollcombobox.h similarity index 100% rename from src/ui/noscrollcombobox.h rename to include/ui/noscrollcombobox.h diff --git a/src/ui/noscrollspinbox.h b/include/ui/noscrollspinbox.h similarity index 100% rename from src/ui/noscrollspinbox.h rename to include/ui/noscrollspinbox.h diff --git a/src/ui/selectablepixmapitem.h b/include/ui/selectablepixmapitem.h similarity index 100% rename from src/ui/selectablepixmapitem.h rename to include/ui/selectablepixmapitem.h diff --git a/porymap.pro b/porymap.pro new file mode 100644 index 00000000..665b5c19 --- /dev/null +++ b/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 diff --git a/src/resources/icons/add.ico b/resources/icons/add.ico similarity index 100% rename from src/resources/icons/add.ico rename to resources/icons/add.ico diff --git a/src/resources/icons/cursor.ico b/resources/icons/cursor.ico similarity index 100% rename from src/resources/icons/cursor.ico rename to resources/icons/cursor.ico diff --git a/src/resources/icons/delete.ico b/resources/icons/delete.ico similarity index 100% rename from src/resources/icons/delete.ico rename to resources/icons/delete.ico diff --git a/src/resources/icons/fill_color.ico b/resources/icons/fill_color.ico similarity index 100% rename from src/resources/icons/fill_color.ico rename to resources/icons/fill_color.ico diff --git a/src/resources/icons/fill_color_cursor.ico b/resources/icons/fill_color_cursor.ico similarity index 100% rename from src/resources/icons/fill_color_cursor.ico rename to resources/icons/fill_color_cursor.ico diff --git a/src/resources/icons/folder.ico b/resources/icons/folder.ico similarity index 100% rename from src/resources/icons/folder.ico rename to resources/icons/folder.ico diff --git a/src/resources/icons/folder_closed.ico b/resources/icons/folder_closed.ico similarity index 100% rename from src/resources/icons/folder_closed.ico rename to resources/icons/folder_closed.ico diff --git a/src/resources/icons/folder_closed_map.ico b/resources/icons/folder_closed_map.ico similarity index 100% rename from src/resources/icons/folder_closed_map.ico rename to resources/icons/folder_closed_map.ico diff --git a/src/resources/icons/folder_image.ico b/resources/icons/folder_image.ico similarity index 100% rename from src/resources/icons/folder_image.ico rename to resources/icons/folder_image.ico diff --git a/src/resources/icons/folder_map.ico b/resources/icons/folder_map.ico similarity index 100% rename from src/resources/icons/folder_map.ico rename to resources/icons/folder_map.ico diff --git a/src/resources/icons/image.ico b/resources/icons/image.ico similarity index 100% rename from src/resources/icons/image.ico rename to resources/icons/image.ico diff --git a/src/resources/icons/map.ico b/resources/icons/map.ico similarity index 100% rename from src/resources/icons/map.ico rename to resources/icons/map.ico diff --git a/src/resources/icons/move.ico b/resources/icons/move.ico similarity index 100% rename from src/resources/icons/move.ico rename to resources/icons/move.ico diff --git a/src/resources/icons/pencil.ico b/resources/icons/pencil.ico similarity index 100% rename from src/resources/icons/pencil.ico rename to resources/icons/pencil.ico diff --git a/src/resources/icons/pencil_cursor.ico b/resources/icons/pencil_cursor.ico similarity index 100% rename from src/resources/icons/pencil_cursor.ico rename to resources/icons/pencil_cursor.ico diff --git a/src/resources/icons/pipette.ico b/resources/icons/pipette.ico similarity index 100% rename from src/resources/icons/pipette.ico rename to resources/icons/pipette.ico diff --git a/src/resources/icons/pipette_cursor.ico b/resources/icons/pipette_cursor.ico similarity index 100% rename from src/resources/icons/pipette_cursor.ico rename to resources/icons/pipette_cursor.ico diff --git a/src/resources/icons/porymap-icon-1.ico b/resources/icons/porymap-icon-1.ico similarity index 100% rename from src/resources/icons/porymap-icon-1.ico rename to resources/icons/porymap-icon-1.ico diff --git a/src/resources/icons/shift.ico b/resources/icons/shift.ico similarity index 100% rename from src/resources/icons/shift.ico rename to resources/icons/shift.ico diff --git a/src/resources/icons/shift_cursor.ico b/resources/icons/shift_cursor.ico similarity index 100% rename from src/resources/icons/shift_cursor.ico rename to resources/icons/shift_cursor.ico diff --git a/src/resources/icons/viewsprites.ico b/resources/icons/viewsprites.ico similarity index 100% rename from src/resources/icons/viewsprites.ico rename to resources/icons/viewsprites.ico diff --git a/src/resources/images.qrc b/resources/images.qrc similarity index 100% rename from src/resources/images.qrc rename to resources/images.qrc diff --git a/src/resources/images/Entities_16x16.png b/resources/images/Entities_16x16.png similarity index 100% rename from src/resources/images/Entities_16x16.png rename to resources/images/Entities_16x16.png diff --git a/src/resources/images/collisions.png b/resources/images/collisions.png similarity index 100% rename from src/resources/images/collisions.png rename to resources/images/collisions.png diff --git a/src/porymap.pro b/src/porymap.pro deleted file mode 100644 index 2bfd2dcc..00000000 --- a/src/porymap.pro +++ /dev/null @@ -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 diff --git a/src/ui/mapsceneeventfilter.cpp b/src/ui/mapsceneeventfilter.cpp index 4c53e614..f8ae14cb 100644 --- a/src/ui/mapsceneeventfilter.cpp +++ b/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) {