From c3bc305bb6ccefd7604e39d491a625d090150ec7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 29 Jun 2021 11:22:47 +0200
Subject: [PATCH] [partition] Shuffle Config and ViewStep to top

Modules nearly always have a Config and either a Job or ViewStep
as their "top level" components. Everything else is implementation-
detail. The *partition* module was unusual in that those two
"top level" components were tucked away in subdirectories.

Shuffle them to the top: this makes it more clear that these
two files are there to coordinate the module.
---
 src/modules/partition/CMakeLists.txt            |  5 +++--
 src/modules/partition/{core => }/Config.cpp     |  2 +-
 src/modules/partition/{core => }/Config.h       |  0
 .../partition/{gui => }/PartitionViewStep.cpp   |  4 ++--
 .../partition/{gui => }/PartitionViewStep.h     |  0
 src/modules/partition/core/PartitionActions.h   |  2 +-
 src/modules/partition/gui/ChoicePage.cpp        | 17 +++++++++--------
 src/modules/partition/gui/ChoicePage.h          |  2 +-
 8 files changed, 17 insertions(+), 15 deletions(-)
 rename src/modules/partition/{core => }/Config.cpp (99%)
 rename src/modules/partition/{core => }/Config.h (100%)
 rename src/modules/partition/{gui => }/PartitionViewStep.cpp (99%)
 rename src/modules/partition/{gui => }/PartitionViewStep.h (100%)

diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index bffb2128c..26d4ffae7 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -49,9 +49,11 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
         TYPE viewmodule
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         SOURCES
+            Config.cpp
+            PartitionViewStep.cpp
+
             core/BootLoaderModel.cpp
             core/ColorUtils.cpp
-            core/Config.cpp
             core/DeviceList.cpp
             core/DeviceModel.cpp
             core/KPMHelpers.cpp
@@ -75,7 +77,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
             gui/PartitionLabelsView.cpp
             gui/PartitionSizeController.cpp
             gui/PartitionSplitterWidget.cpp
-            gui/PartitionViewStep.cpp
             gui/ResizeVolumeGroupDialog.cpp
             gui/ScanningDialog.cpp
             gui/ReplaceWidget.cpp
diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/Config.cpp
similarity index 99%
rename from src/modules/partition/core/Config.cpp
rename to src/modules/partition/Config.cpp
index 69dbe17d3..c24fdea20 100644
--- a/src/modules/partition/core/Config.cpp
+++ b/src/modules/partition/Config.cpp
@@ -9,7 +9,7 @@
 
 #include "Config.h"
 
-#include "PartUtils.h"
+#include "core/PartUtils.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/Config.h
similarity index 100%
rename from src/modules/partition/core/Config.h
rename to src/modules/partition/Config.h
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
similarity index 99%
rename from src/modules/partition/gui/PartitionViewStep.cpp
rename to src/modules/partition/PartitionViewStep.cpp
index cc06ba967..c75706972 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -11,10 +11,10 @@
  *
  */
 
-#include "gui/PartitionViewStep.h"
+#include "PartitionViewStep.h"
 
+#include "Config.h"
 #include "core/BootLoaderModel.h"
-#include "core/Config.h"
 #include "core/DeviceModel.h"
 #include "core/PartitionCoreModule.h"
 #include "gui/ChoicePage.h"
diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/PartitionViewStep.h
similarity index 100%
rename from src/modules/partition/gui/PartitionViewStep.h
rename to src/modules/partition/PartitionViewStep.h
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index 3a345dc4e..4a60f4735 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -10,7 +10,7 @@
 #ifndef PARTITIONACTIONS_H
 #define PARTITIONACTIONS_H
 
-#include "core/Config.h"
+#include "Config.h"
 
 #include <QSet>
 #include <QString>
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 0c86fd718..6bbb852be 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -11,15 +11,9 @@
 
 #include "ChoicePage.h"
 
-#include "BootInfoWidget.h"
-#include "DeviceInfoWidget.h"
-#include "PartitionBarsView.h"
-#include "PartitionLabelsView.h"
-#include "PartitionSplitterWidget.h"
-#include "ReplaceWidget.h"
-#include "ScanningDialog.h"
+#include "Config.h"
+
 #include "core/BootLoaderModel.h"
-#include "core/Config.h"
 #include "core/DeviceModel.h"
 #include "core/KPMHelpers.h"
 #include "core/OsproberEntry.h"
@@ -28,6 +22,13 @@
 #include "core/PartitionCoreModule.h"
 #include "core/PartitionInfo.h"
 #include "core/PartitionModel.h"
+#include "gui/BootInfoWidget.h"
+#include "gui/DeviceInfoWidget.h"
+#include "gui/PartitionBarsView.h"
+#include "gui/PartitionLabelsView.h"
+#include "gui/PartitionSplitterWidget.h"
+#include "gui/ReplaceWidget.h"
+#include "gui/ScanningDialog.h"
 
 #include "Branding.h"
 #include "GlobalStorage.h"
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index 30de05cb9..5e0a24d43 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -15,7 +15,7 @@
 #include "ui_ChoicePage.h"
 
 
-#include "core/Config.h"
+#include "Config.h"
 #include "core/OsproberEntry.h"
 
 #include <QMutex>