From 658ca1b74c6ae2ee4a86298d41f7c5bf9f727060 Mon Sep 17 00:00:00 2001 From: Luca D'Amico Date: Mon, 1 Mar 2021 18:56:19 +0100 Subject: [PATCH] Better project organization --- CMakeLists.txt | 38 ++++++++++--------- main.cpp | 2 +- crctable.h => ndsfactory/crctable.h | 0 fatstruct.h => ndsfactory/fatstruct.h | 0 ndsfactory.cpp => ndsfactory/ndsfactory.cpp | 0 ndsfactory.h => ndsfactory/ndsfactory.h | 0 ndsheader.h => ndsfactory/ndsheader.h | 0 .../dialogs/about/aboutdialog.cpp | 0 .../dialogs/about/aboutdialog.h | 0 .../dialogs/about/aboutdialog.ui | 0 mainwindow.cpp => ui/mainwindow.cpp | 2 +- mainwindow.h => ui/mainwindow.h | 2 +- mainwindow.ui => ui/mainwindow.ui | 0 .../fatpatching/fatpatchingtabfunctions.cpp | 2 +- .../fatpatching/fatpatchingtabsignals.cpp | 4 +- .../tabs/packer/packertabfunctions.cpp | 4 +- .../tabs/packer/packertabsignals.cpp | 4 +- .../tabs/unpacker/unpackertabfunctions.cpp | 4 +- .../tabs/unpacker/unpackertabsignals.cpp | 4 +- 19 files changed, 35 insertions(+), 31 deletions(-) rename crctable.h => ndsfactory/crctable.h (100%) rename fatstruct.h => ndsfactory/fatstruct.h (100%) rename ndsfactory.cpp => ndsfactory/ndsfactory.cpp (100%) rename ndsfactory.h => ndsfactory/ndsfactory.h (100%) rename ndsheader.h => ndsfactory/ndsheader.h (100%) rename aboutdialog.cpp => ui/dialogs/about/aboutdialog.cpp (100%) rename aboutdialog.h => ui/dialogs/about/aboutdialog.h (100%) rename aboutdialog.ui => ui/dialogs/about/aboutdialog.ui (100%) rename mainwindow.cpp => ui/mainwindow.cpp (92%) rename mainwindow.h => ui/mainwindow.h (99%) rename mainwindow.ui => ui/mainwindow.ui (100%) rename fatpatchingtabfunctions.cpp => ui/tabs/fatpatching/fatpatchingtabfunctions.cpp (84%) rename fatpatchingtabsignals.cpp => ui/tabs/fatpatching/fatpatchingtabsignals.cpp (94%) rename packertabfunctions.cpp => ui/tabs/packer/packertabfunctions.cpp (99%) rename packertabsignals.cpp => ui/tabs/packer/packertabsignals.cpp (98%) rename unpackertabfunctions.cpp => ui/tabs/unpacker/unpackertabfunctions.cpp (99%) rename unpackertabsignals.cpp => ui/tabs/unpacker/unpackertabsignals.cpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ede82b..bf27d0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,31 +10,35 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +# Dialogs +file(GLOB_RECURSE DIALOGS_HEADERS ui/dialogs/*.h) +file(GLOB_RECURSE DIALOGS_SOURCES ui/dialogs/*.cpp) +file(GLOB_RECURSE DIALOGS_UIS ui/dialogs/*.ui) + +# Tabs +file(GLOB_RECURSE TABS_SOURCES ui/tabs/*.cpp) + +# NDSFactory +file(GLOB_RECURSE NDSFACTORY_SOURCES ndsfactory/*.cpp) +file(GLOB_RECURSE NDSFACTORY_HEADERS ndsfactory/*.h) + set(SOURCES main.cpp - mainwindow.cpp - ndsfactory.cpp - aboutdialog.cpp - unpackertabfunctions.cpp - unpackertabsignals.cpp - packertabsignals.cpp - packertabfunctions.cpp - fatpatchingtabsignals.cpp - fatpatchingtabfunctions.cpp + ui/mainwindow.cpp + ${NDSFACTORY_SOURCES} + ${DIALOGS_SOURCES} + ${TABS_SOURCES} ) SET(HEADERS - mainwindow.h - ndsheader.h - ndsfactory.h - aboutdialog.h - fatstruct.h - crctable.h + ui/mainwindow.h + ${NDSFACTORY_HEADERS} + ${DIALOGS_HEADERS} ) set(FORMS - mainwindow.ui - aboutdialog.ui + ui/mainwindow.ui + ${DIALOGS_UIS} ) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/main.cpp b/main.cpp index b48f94e..e7f5c57 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "ui/mainwindow.h" #include int main(int argc, char *argv[]) diff --git a/crctable.h b/ndsfactory/crctable.h similarity index 100% rename from crctable.h rename to ndsfactory/crctable.h diff --git a/fatstruct.h b/ndsfactory/fatstruct.h similarity index 100% rename from fatstruct.h rename to ndsfactory/fatstruct.h diff --git a/ndsfactory.cpp b/ndsfactory/ndsfactory.cpp similarity index 100% rename from ndsfactory.cpp rename to ndsfactory/ndsfactory.cpp diff --git a/ndsfactory.h b/ndsfactory/ndsfactory.h similarity index 100% rename from ndsfactory.h rename to ndsfactory/ndsfactory.h diff --git a/ndsheader.h b/ndsfactory/ndsheader.h similarity index 100% rename from ndsheader.h rename to ndsfactory/ndsheader.h diff --git a/aboutdialog.cpp b/ui/dialogs/about/aboutdialog.cpp similarity index 100% rename from aboutdialog.cpp rename to ui/dialogs/about/aboutdialog.cpp diff --git a/aboutdialog.h b/ui/dialogs/about/aboutdialog.h similarity index 100% rename from aboutdialog.h rename to ui/dialogs/about/aboutdialog.h diff --git a/aboutdialog.ui b/ui/dialogs/about/aboutdialog.ui similarity index 100% rename from aboutdialog.ui rename to ui/dialogs/about/aboutdialog.ui diff --git a/mainwindow.cpp b/ui/mainwindow.cpp similarity index 92% rename from mainwindow.cpp rename to ui/mainwindow.cpp index f54834a..462c472 100644 --- a/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -1,7 +1,7 @@ #include #include "mainwindow.h" #include "ui_mainwindow.h" -#include "aboutdialog.h" +#include "dialogs/about/aboutdialog.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), diff --git a/mainwindow.h b/ui/mainwindow.h similarity index 99% rename from mainwindow.h rename to ui/mainwindow.h index b075a68..8d8c5e1 100644 --- a/mainwindow.h +++ b/ui/mainwindow.h @@ -3,7 +3,7 @@ #include #include -#include "ndsfactory.h" +#include "../ndsfactory/ndsfactory.h" namespace Ui { diff --git a/mainwindow.ui b/ui/mainwindow.ui similarity index 100% rename from mainwindow.ui rename to ui/mainwindow.ui diff --git a/fatpatchingtabfunctions.cpp b/ui/tabs/fatpatching/fatpatchingtabfunctions.cpp similarity index 84% rename from fatpatchingtabfunctions.cpp rename to ui/tabs/fatpatching/fatpatchingtabfunctions.cpp index 33c5cfb..cbb4383 100644 --- a/fatpatchingtabfunctions.cpp +++ b/ui/tabs/fatpatching/fatpatchingtabfunctions.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "./../../mainwindow.h" bool MainWindow::patchFat(const std::string& loadPath, uint32_t shiftSize, const std::string& savePath) diff --git a/fatpatchingtabsignals.cpp b/ui/tabs/fatpatching/fatpatchingtabsignals.cpp similarity index 94% rename from fatpatchingtabsignals.cpp rename to ui/tabs/fatpatching/fatpatchingtabsignals.cpp index 0c9d7f7..e4b2467 100644 --- a/fatpatchingtabsignals.cpp +++ b/ui/tabs/fatpatching/fatpatchingtabsignals.cpp @@ -1,7 +1,7 @@ #include #include -#include "mainwindow.h" -#include "ui_mainwindow.h" +#include "./../../mainwindow.h" +#include "./../../ui_mainwindow.h" void MainWindow::on_fatPatchingLoadFatBtn_clicked() diff --git a/packertabfunctions.cpp b/ui/tabs/packer/packertabfunctions.cpp similarity index 99% rename from packertabfunctions.cpp rename to ui/tabs/packer/packertabfunctions.cpp index dce5c75..de05a6e 100644 --- a/packertabfunctions.cpp +++ b/ui/tabs/packer/packertabfunctions.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "mainwindow.h" -#include "ui_mainwindow.h" +#include "./../../mainwindow.h" +#include "./../../ui_mainwindow.h" void MainWindow::populatePackerSectionHeader(NDSHeader *ndsHeader) diff --git a/packertabsignals.cpp b/ui/tabs/packer/packertabsignals.cpp similarity index 98% rename from packertabsignals.cpp rename to ui/tabs/packer/packertabsignals.cpp index b8d36cd..67600f7 100644 --- a/packertabsignals.cpp +++ b/ui/tabs/packer/packertabsignals.cpp @@ -1,7 +1,7 @@ #include #include -#include "mainwindow.h" -#include "ui_mainwindow.h" +#include "./../../mainwindow.h" +#include "./../../ui_mainwindow.h" void MainWindow::on_packerLoadHeaderBtn_clicked() diff --git a/unpackertabfunctions.cpp b/ui/tabs/unpacker/unpackertabfunctions.cpp similarity index 99% rename from unpackertabfunctions.cpp rename to ui/tabs/unpacker/unpackertabfunctions.cpp index 63f7d32..cfdc8e3 100644 --- a/unpackertabfunctions.cpp +++ b/ui/tabs/unpacker/unpackertabfunctions.cpp @@ -3,8 +3,8 @@ #include #include #include -#include "mainwindow.h" -#include "ui_mainwindow.h" +#include "./../../mainwindow.h" +#include "./../../ui_mainwindow.h" void MainWindow::populateHeader(NDSHeader* ndsHeader) diff --git a/unpackertabsignals.cpp b/ui/tabs/unpacker/unpackertabsignals.cpp similarity index 99% rename from unpackertabsignals.cpp rename to ui/tabs/unpacker/unpackertabsignals.cpp index d90d8d3..c1698f1 100644 --- a/unpackertabsignals.cpp +++ b/ui/tabs/unpacker/unpackertabsignals.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "mainwindow.h" -#include "ui_mainwindow.h" +#include "./../../mainwindow.h" +#include "./../../ui_mainwindow.h" void MainWindow::on_loadRomBtn_clicked()