Better project organization

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")

main.cpp

@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "ui/mainwindow.h"
 #include <QApplication>
 
 int main(int argc, char *argv[])

ui/mainwindow.cpp

@@ -1,7 +1,7 @@
 #include <QApplication>
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "aboutdialog.h"
+#include "dialogs/about/aboutdialog.h"
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),

ui/mainwindow.h

@@ -3,7 +3,7 @@
 
 #include <QMainWindow>
 #include <cstdint>
-#include "ndsfactory.h"
+#include "../ndsfactory/ndsfactory.h"
 
 
 namespace Ui {

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)

ui/tabs/fatpatching/fatpatchingtabsignals.cpp

@@ -1,7 +1,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "./../../mainwindow.h"
+#include "./../../ui_mainwindow.h"
 
 
 void MainWindow::on_fatPatchingLoadFatBtn_clicked()

ui/tabs/packer/packertabfunctions.cpp

@@ -1,8 +1,8 @@
 #include <QDir>
 #include <cstring>
 #include <algorithm>
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "./../../mainwindow.h"
+#include "./../../ui_mainwindow.h"
 
 
 void MainWindow::populatePackerSectionHeader(NDSHeader *ndsHeader)

ui/tabs/packer/packertabsignals.cpp

@@ -1,7 +1,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "./../../mainwindow.h"
+#include "./../../ui_mainwindow.h"
 
 
 void MainWindow::on_packerLoadHeaderBtn_clicked()

ui/tabs/unpacker/unpackertabfunctions.cpp

@@ -3,8 +3,8 @@
 #include <cstring>
 #include <sstream>
 #include <iomanip>
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "./../../mainwindow.h"
+#include "./../../ui_mainwindow.h"
 
 
 void MainWindow::populateHeader(NDSHeader* ndsHeader)

ui/tabs/unpacker/unpackertabsignals.cpp

@@ -1,8 +1,8 @@
 #include <QFileDialog>
 #include <vector>
 #include <QMessageBox>
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "./../../mainwindow.h"
+#include "./../../ui_mainwindow.h"
 
 
 void MainWindow::on_loadRomBtn_clicked()