Everywhere: Move source files to separate subdirs

Currently all of the source files are located in src/ subdirectory, although it gets increasingly harder and harder to find anything in this pile. This patch moves those files to separate subdirectories that are named accordingly to the theme that files in them represent, for example - subdirectory "undostack" will hold undostack and all commands related to the stack. There might be code in some places, for example in palettewidget.cpp that has "undostack" command inside of it, but moving that will come in a separate refactor PR in the future.
diasurgical · Dec 4, 2023 · bb49dbb · bb49dbb
1 parent aa4264b
commit bb49dbb
Show file tree

Hide file tree

Showing 69 changed files with 100 additions and 99 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,41 +12,42 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
 
-
 include_directories(source/)
+
 set(PROJECT_SOURCES
-        source/celview.cpp
-        source/framecmds.cpp
-        source/config.cpp
-        source/d1amp.cpp
-        source/d1cel.cpp
-        source/d1celframe.cpp
-        source/d1celtileset.cpp
-        source/d1celtilesetframe.cpp
-        source/d1cl2.cpp
-        source/d1gfx.cpp
-        source/d1image.cpp
-        source/d1min.cpp
-        source/d1pal.cpp
-        source/d1palhits.cpp
-        source/d1sol.cpp
-        source/d1til.cpp
-        source/d1trn.cpp
-        source/exportdialog.cpp
-        source/view.cpp
-        source/levelcelview.cpp
-        source/leveltabframewidget.cpp
-        source/leveltabsubtilewidget.cpp
-        source/leveltabtilewidget.cpp
+        source/views/celview.cpp
+        source/config/config.cpp
+        source/d1formats/d1amp.cpp
+        source/d1formats/d1cel.cpp
+        source/d1formats/d1celframe.cpp
+        source/d1formats/d1celtileset.cpp
+        source/d1formats/d1celtilesetframe.cpp
+        source/d1formats/d1cl2.cpp
+        source/d1formats/d1gfx.cpp
+        source/d1formats/d1image.cpp
+        source/d1formats/d1min.cpp
+        source/palette/d1pal.cpp
+        source/palette/d1palhits.cpp
+        source/d1formats/d1sol.cpp
+        source/d1formats/d1til.cpp
+        source/d1formats/d1trn.cpp
+        source/dialogs/exportdialog.cpp
+        source/views/view.cpp
+        source/views/levelcelview.cpp
+        source/widgets/leveltabframewidget.cpp
+        source/widgets/leveltabsubtilewidget.cpp
+        source/widgets/leveltabtilewidget.cpp
         source/main.cpp
         source/mainwindow.cpp
-        source/openasdialog.cpp
-        source/palettewidget.cpp
-        source/settingsdialog.cpp
-        source/undostack.cpp
-        source/undostack.h
-        source/command.cpp
-        source/command.h
+        source/dialogs/openasdialog.cpp
+        source/widgets/palettewidget.cpp
+        source/dialogs/settingsdialog.cpp
+        source/undostack/framecmds.cpp
+        source/undostack/framecmds.h
+        source/undostack/undostack.cpp
+        source/undostack/undostack.h
+        source/undostack/command.cpp
+        source/undostack/command.h
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)

diff --git a/source/config.cpp → source/config/config.cpp b/source/config.cpp → source/config/config.cpp
diff --git a/source/config.h → source/config/config.h b/source/config.h → source/config/config.h
diff --git a/source/d1amp.cpp → source/d1formats/d1amp.cpp b/source/d1amp.cpp → source/d1formats/d1amp.cpp
diff --git a/source/d1amp.h → source/d1formats/d1amp.h b/source/d1amp.h → source/d1formats/d1amp.h
@@ -3,7 +3,7 @@
 #include <QList>
 #include <QString>
 
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 class D1Amp : public QObject {
     Q_OBJECT

diff --git a/source/d1cel.cpp → source/d1formats/d1cel.cpp b/source/d1cel.cpp → source/d1formats/d1cel.cpp
diff --git a/source/d1cel.h → source/d1formats/d1cel.h b/source/d1cel.h → source/d1formats/d1cel.h
@@ -4,7 +4,7 @@
 #include <QString>
 
 #include "d1gfx.h"
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 class D1Cel {
 public:

diff --git a/source/d1celframe.cpp → source/d1formats/d1celframe.cpp b/source/d1celframe.cpp → source/d1formats/d1celframe.cpp
diff --git a/source/d1celframe.h → source/d1formats/d1celframe.h b/source/d1celframe.h → source/d1formats/d1celframe.h
@@ -3,7 +3,7 @@
 #include <QByteArray>
 
 #include "d1gfx.h"
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 // Class used only for CEL frame width calculation
 class D1CelPixelGroup {

diff --git a/source/d1celtileset.cpp → source/d1formats/d1celtileset.cpp b/source/d1celtileset.cpp → source/d1formats/d1celtileset.cpp
diff --git a/source/d1celtileset.h → source/d1formats/d1celtileset.h b/source/d1celtileset.h → source/d1formats/d1celtileset.h
@@ -7,7 +7,7 @@
 
 #include "d1celtilesetframe.h"
 #include "d1gfx.h"
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 class D1CelTileset {
 public:

diff --git a/source/d1celtilesetframe.cpp → source/d1formats/d1celtilesetframe.cpp b/source/d1celtilesetframe.cpp → source/d1formats/d1celtilesetframe.cpp
diff --git a/source/d1celtilesetframe.h → source/d1formats/d1celtilesetframe.h b/source/d1celtilesetframe.h → source/d1formats/d1celtilesetframe.h
@@ -2,7 +2,7 @@
 
 #include <QByteArray>
 
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 #define MICRO_WIDTH 32
 #define MICRO_HEIGHT 32

diff --git a/source/d1cl2.cpp → source/d1formats/d1cl2.cpp b/source/d1cl2.cpp → source/d1formats/d1cl2.cpp
diff --git a/source/d1cl2.h → source/d1formats/d1cl2.h b/source/d1cl2.h → source/d1formats/d1cl2.h
@@ -4,7 +4,7 @@
 #include <QString>
 
 #include "d1gfx.h"
-#include "openasdialog.h"
+#include "dialogs/openasdialog.h"
 
 class D1Cl2Frame {
     friend class D1Cl2;

diff --git a/source/d1gfx.cpp → source/d1formats/d1gfx.cpp b/source/d1gfx.cpp → source/d1formats/d1gfx.cpp
diff --git a/source/d1gfx.h → source/d1formats/d1gfx.h b/source/d1gfx.h → source/d1formats/d1gfx.h
@@ -7,7 +7,7 @@
 #include <optional>
 
 #include "d1celtilesetframe.h"
-#include "d1pal.h"
+#include "palette/d1pal.h"
 
 // TODO: move these to some persistency class?
 #define SUB_HEADER_SIZE 0x0A

diff --git a/source/d1image.cpp → source/d1formats/d1image.cpp b/source/d1image.cpp → source/d1formats/d1image.cpp
diff --git a/source/d1image.h → source/d1formats/d1image.h b/source/d1image.h → source/d1formats/d1image.h
@@ -4,7 +4,7 @@
 #include <QString>
 
 #include "d1gfx.h"
-#include "d1pal.h"
+#include "palette/d1pal.h"
 
 // alpha value under which the color is considered as transparent
 #define COLOR_ALPHA_LIMIT 128

diff --git a/source/d1min.cpp → source/d1formats/d1min.cpp b/source/d1min.cpp → source/d1formats/d1min.cpp
diff --git a/source/d1min.h → source/d1formats/d1min.h b/source/d1min.h → source/d1formats/d1min.h
diff --git a/source/d1sol.cpp → source/d1formats/d1sol.cpp b/source/d1sol.cpp → source/d1formats/d1sol.cpp
diff --git a/source/d1sol.h → source/d1formats/d1sol.h b/source/d1sol.h → source/d1formats/d1sol.h
diff --git a/source/d1til.cpp → source/d1formats/d1til.cpp b/source/d1til.cpp → source/d1formats/d1til.cpp
diff --git a/source/d1til.h → source/d1formats/d1til.h b/source/d1til.h → source/d1formats/d1til.h
diff --git a/source/d1trn.cpp → source/d1formats/d1trn.cpp b/source/d1trn.cpp → source/d1formats/d1trn.cpp
diff --git a/source/d1trn.h → source/d1formats/d1trn.h b/source/d1trn.h → source/d1formats/d1trn.h
@@ -2,7 +2,7 @@
 
 #include <QPointer>
 
-#include "d1pal.h"
+#include "palette/d1pal.h"
 
 #define D1TRN_TRANSLATIONS 256
 

diff --git a/source/exportdialog.cpp → source/dialogs/exportdialog.cpp b/source/exportdialog.cpp → source/dialogs/exportdialog.cpp
diff --git a/source/exportdialog.h → source/dialogs/exportdialog.h b/source/exportdialog.h → source/dialogs/exportdialog.h
@@ -3,11 +3,11 @@
 #include <QDialog>
 #include <QProgressDialog>
 
-#include "d1amp.h"
-#include "d1gfx.h"
-#include "d1min.h"
-#include "d1sol.h"
-#include "d1til.h"
+#include "d1formats/d1amp.h"
+#include "d1formats/d1gfx.h"
+#include "d1formats/d1min.h"
+#include "d1formats/d1sol.h"
+#include "d1formats/d1til.h"
 
 namespace Ui {
 class ExportDialog;

diff --git a/source/exportdialog.ui → source/dialogs/exportdialog.ui b/source/exportdialog.ui → source/dialogs/exportdialog.ui
diff --git a/source/openasdialog.cpp → source/dialogs/openasdialog.cpp b/source/openasdialog.cpp → source/dialogs/openasdialog.cpp
diff --git a/source/openasdialog.h → source/dialogs/openasdialog.h b/source/openasdialog.h → source/dialogs/openasdialog.h
diff --git a/source/openasdialog.ui → source/dialogs/openasdialog.ui b/source/openasdialog.ui → source/dialogs/openasdialog.ui
diff --git a/source/settingsdialog.cpp → source/dialogs/settingsdialog.cpp b/source/settingsdialog.cpp → source/dialogs/settingsdialog.cpp
@@ -3,7 +3,7 @@
 #include <QColorDialog>
 #include <QFileDialog>
 
-#include "config.h"
+#include "config/config.h"
 #include "ui_settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)

diff --git a/source/settingsdialog.h → source/dialogs/settingsdialog.h b/source/settingsdialog.h → source/dialogs/settingsdialog.h
diff --git a/source/settingsdialog.ui → source/dialogs/settingsdialog.ui b/source/settingsdialog.ui → source/dialogs/settingsdialog.ui
diff --git a/source/main.cpp b/source/main.cpp
@@ -2,7 +2,7 @@
 #include <QDebug>
 #include <QFile>
 
-#include "config.h"
+#include "config/config.h"
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])

diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
@@ -21,10 +21,10 @@
 #include <QTime>
 #include <QtWidgets>
 
-#include "config.h"
-#include "d1cel.h"
-#include "d1celtileset.h"
-#include "d1cl2.h"
+#include "config/config.h"
+#include "d1formats/d1cel.h"
+#include "d1formats/d1celtileset.h"
+#include "d1formats/d1cl2.h"
 #include "ui_mainwindow.h"
 
 MainWindow::MainWindow()

diff --git a/source/mainwindow.h b/source/mainwindow.h
@@ -8,20 +8,20 @@
 
 #include <memory>
 
-#include "celview.h"
-#include "d1gfx.h"
-#include "d1min.h"
-#include "d1pal.h"
-#include "d1palhits.h"
-#include "d1sol.h"
-#include "d1til.h"
-#include "d1trn.h"
-#include "exportdialog.h"
-#include "levelcelview.h"
-#include "openasdialog.h"
-#include "palettewidget.h"
-#include "settingsdialog.h"
-#include <undostack.h>
+#include "d1formats/d1gfx.h"
+#include "d1formats/d1min.h"
+#include "d1formats/d1sol.h"
+#include "d1formats/d1til.h"
+#include "d1formats/d1trn.h"
+#include "dialogs/exportdialog.h"
+#include "dialogs/openasdialog.h"
+#include "dialogs/settingsdialog.h"
+#include "palette/d1pal.h"
+#include "palette/d1palhits.h"
+#include "undostack/undostack.h"
+#include "views/celview.h"
+#include "views/levelcelview.h"
+#include "widgets/palettewidget.h"
 
 #define D1_GRAPHICS_TOOL_TITLE "Diablo 1 Graphics Tool"
 #define D1_GRAPHICS_TOOL_VERSION "1.0.1"

diff --git a/source/d1pal.cpp → source/palette/d1pal.cpp b/source/d1pal.cpp → source/palette/d1pal.cpp
diff --git a/source/d1pal.h → source/palette/d1pal.h b/source/d1pal.h → source/palette/d1pal.h
diff --git a/source/d1palhits.cpp → source/palette/d1palhits.cpp b/source/d1palhits.cpp → source/palette/d1palhits.cpp
diff --git a/source/d1palhits.h → source/palette/d1palhits.h b/source/d1palhits.h → source/palette/d1palhits.h
@@ -2,9 +2,9 @@
 
 #include <QMap>
 
-#include "d1gfx.h"
-#include "d1min.h"
-#include "d1til.h"
+#include "d1formats/d1gfx.h"
+#include "d1formats/d1min.h"
+#include "d1formats/d1til.h"
 
 enum class D1PALHITS_MODE {
     ALL_COLORS,

diff --git a/source/command.cpp → source/undostack/command.cpp b/source/command.cpp → source/undostack/command.cpp
diff --git a/source/command.h → source/undostack/command.h b/source/command.h → source/undostack/command.h
diff --git a/source/framecmds.cpp → source/undostack/framecmds.cpp b/source/framecmds.cpp → source/undostack/framecmds.cpp
diff --git a/source/framecmds.h → source/undostack/framecmds.h b/source/framecmds.h → source/undostack/framecmds.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "celview.h"
 #include "command.h"
+#include "views/celview.h"
 
 #include <QObject>
 

diff --git a/source/undostack.cpp → source/undostack/undostack.cpp b/source/undostack.cpp → source/undostack/undostack.cpp
diff --git a/source/undostack.h → source/undostack/undostack.h b/source/undostack.h → source/undostack/undostack.h
diff --git a/source/celview.cpp → source/views/celview.cpp b/source/celview.cpp → source/views/celview.cpp
@@ -11,9 +11,9 @@
 #include <QMessageBox>
 #include <QMimeData>
 
-#include "framecmds.h"
 #include "mainwindow.h"
 #include "ui_celview.h"
+#include "undostack/framecmds.h"
 
 CelScene::CelScene(QWidget *v)
     : QGraphicsScene()

diff --git a/source/celview.h → source/views/celview.h b/source/celview.h → source/views/celview.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <stack>
 
-#include "d1gfx.h"
-#include "undostack.h"
+#include "d1formats/d1gfx.h"
+#include "undostack/undostack.h"
 
 #define CEL_SCENE_SPACING 8
 

diff --git a/source/celview.ui → source/views/celview.ui b/source/celview.ui → source/views/celview.ui
@@ -781,7 +781,7 @@
   <customwidget>
    <class>View</class>
    <extends>QGraphicsView</extends>
-   <header>view.h</header>
+   <header>views/view.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/source/levelcelview.cpp → source/views/levelcelview.cpp b/source/levelcelview.cpp → source/views/levelcelview.cpp
@@ -3,10 +3,10 @@
 #include <algorithm>
 #include <set>
 
-#include "d1image.h"
-#include "framecmds.h"
+#include "d1formats/d1image.h"
 #include "mainwindow.h"
 #include "ui_levelcelview.h"
+#include "undostack/framecmds.h"
 
 #include <QAction>
 #include <QDebug>

diff --git a/source/levelcelview.h → source/views/levelcelview.h b/source/levelcelview.h → source/views/levelcelview.h
@@ -17,15 +17,15 @@
 #include <vector>
 
 #include "celview.h"
-#include "d1amp.h"
-#include "d1gfx.h"
-#include "d1min.h"
-#include "d1sol.h"
-#include "d1til.h"
-#include "leveltabframewidget.h"
-#include "leveltabsubtilewidget.h"
-#include "leveltabtilewidget.h"
-#include "undostack.h"
+#include "d1formats/d1amp.h"
+#include "d1formats/d1gfx.h"
+#include "d1formats/d1min.h"
+#include "d1formats/d1sol.h"
+#include "d1formats/d1til.h"
+#include "undostack/undostack.h"
+#include "widgets/leveltabframewidget.h"
+#include "widgets/leveltabsubtilewidget.h"
+#include "widgets/leveltabtilewidget.h"
 
 namespace Ui {
 class LevelCelView;

diff --git a/source/levelcelview.ui → source/views/levelcelview.ui b/source/levelcelview.ui → source/views/levelcelview.ui
@@ -1150,7 +1150,7 @@
   <customwidget>
    <class>View</class>
    <extends>QGraphicsView</extends>
-   <header>view.h</header>
+   <header>views/view.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/source/view.cpp → source/views/view.cpp b/source/view.cpp → source/views/view.cpp
diff --git a/source/view.h → source/views/view.h b/source/view.h → source/views/view.h
diff --git a/source/leveltabframewidget.cpp → source/widgets/leveltabframewidget.cpp b/source/leveltabframewidget.cpp → source/widgets/leveltabframewidget.cpp
@@ -1,8 +1,8 @@
 #include "leveltabframewidget.h"
 
-#include "d1gfx.h"
-#include "levelcelview.h"
+#include "d1formats/d1gfx.h"
 #include "ui_leveltabframewidget.h"
+#include "views/levelcelview.h"
 
 LevelTabFrameWidget::LevelTabFrameWidget()
     : QWidget(nullptr)

diff --git a/source/leveltabframewidget.h → source/widgets/leveltabframewidget.h b/source/leveltabframewidget.h → source/widgets/leveltabframewidget.h
diff --git a/source/leveltabframewidget.ui → source/widgets/leveltabframewidget.ui b/source/leveltabframewidget.ui → source/widgets/leveltabframewidget.ui
diff --git a/source/leveltabsubtilewidget.cpp → source/widgets/leveltabsubtilewidget.cpp b/source/leveltabsubtilewidget.cpp → source/widgets/leveltabsubtilewidget.cpp
@@ -1,7 +1,7 @@
 #include "leveltabsubtilewidget.h"
 
-#include "levelcelview.h"
 #include "ui_leveltabsubtilewidget.h"
+#include "views/levelcelview.h"
 
 LevelTabSubTileWidget::LevelTabSubTileWidget()
     : QWidget(nullptr)

diff --git a/source/leveltabsubtilewidget.h → source/widgets/leveltabsubtilewidget.h b/source/leveltabsubtilewidget.h → source/widgets/leveltabsubtilewidget.h
diff --git a/source/leveltabsubtilewidget.ui → source/widgets/leveltabsubtilewidget.ui b/source/leveltabsubtilewidget.ui → source/widgets/leveltabsubtilewidget.ui
diff --git a/source/leveltabtilewidget.cpp → source/widgets/leveltabtilewidget.cpp b/source/leveltabtilewidget.cpp → source/widgets/leveltabtilewidget.cpp
@@ -1,10 +1,10 @@
 #include "leveltabtilewidget.h"
 
-#include "d1amp.h"
-#include "d1min.h"
-#include "d1til.h"
-#include "levelcelview.h"
+#include "d1formats/d1amp.h"
+#include "d1formats/d1min.h"
+#include "d1formats/d1til.h"
 #include "ui_leveltabtilewidget.h"
+#include "views/levelcelview.h"
 
 LevelTabTileWidget::LevelTabTileWidget()
     : QWidget(nullptr)

diff --git a/source/leveltabtilewidget.h → source/widgets/leveltabtilewidget.h b/source/leveltabtilewidget.h → source/widgets/leveltabtilewidget.h
diff --git a/source/leveltabtilewidget.ui → source/widgets/leveltabtilewidget.ui b/source/leveltabtilewidget.ui → source/widgets/leveltabtilewidget.ui
diff --git a/source/palettewidget.cpp → source/widgets/palettewidget.cpp b/source/palettewidget.cpp → source/widgets/palettewidget.cpp
@@ -7,7 +7,7 @@
 #include <QMessageBox>
 #include <QMimeData>
 
-#include "config.h"
+#include "config/config.h"
 #include "mainwindow.h"
 #include "ui_palettewidget.h"