Dispatch files in core/ gui/ and jobs/ dirs

src/modules/partition/CMakeLists.txt

@@ -21,34 +21,34 @@ calamares_add_plugin( partition
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        BootLoaderModel.cpp
+        core/BootLoaderModel.cpp
-        CheckFileSystemJob.cpp
+        core/ColorUtils.cpp
-        ColorUtils.cpp
+        core/DeviceModel.cpp
-        CreatePartitionDialog.cpp
+        core/PartitionCoreModule.cpp
-        CreatePartitionJob.cpp
+        core/PartitionInfo.cpp
-        CreatePartitionTableJob.cpp
+        core/PartitionIterator.cpp
-        DeletePartitionJob.cpp
+        core/PartitionModel.cpp
-        DeviceModel.cpp
+        core/PMUtils.cpp
-        EditExistingPartitionDialog.cpp
+        gui/CreatePartitionDialog.cpp
-        FillGlobalStorageJob.cpp
+        gui/EditExistingPartitionDialog.cpp
-        FormatPartitionJob.cpp
+        gui/PartitionPage.cpp
-        MoveFileSystemJob.cpp
+        gui/PartitionPreview.cpp
-        PartitionCoreModule.cpp
+        gui/PartitionSizeController.cpp
-        PartitionInfo.cpp
+        gui/PartitionViewStep.cpp
-        PartitionIterator.cpp
+        jobs/CheckFileSystemJob.cpp
-        PartitionJob.cpp
+        jobs/CreatePartitionJob.cpp
-        PartitionModel.cpp
+        jobs/CreatePartitionTableJob.cpp
-        PartitionPage.cpp
+        jobs/DeletePartitionJob.cpp
-        PartitionPreview.cpp
+        jobs/FillGlobalStorageJob.cpp
-        PartitionSizeController.cpp
+        jobs/FormatPartitionJob.cpp
-        PartitionViewStep.cpp
+        jobs/MoveFileSystemJob.cpp
-        PMUtils.cpp
+        jobs/PartitionJob.cpp
-        ResizePartitionJob.cpp
+        jobs/ResizePartitionJob.cpp
     UI
-        CreatePartitionDialog.ui
+        gui/CreatePartitionDialog.ui
-        CreatePartitionTableDialog.ui
+        gui/CreatePartitionTableDialog.ui
-        EditExistingPartitionDialog.ui
+        gui/EditExistingPartitionDialog.ui
-        PartitionPage.ui
+        gui/PartitionPage.ui
     LINK_LIBRARIES
         calapm
         calamaresui

src/modules/partition/core/BootLoaderModel.cpp

@@ -15,10 +15,10 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <BootLoaderModel.h>
+#include <core/BootLoaderModel.h>
 
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/device.h>

src/modules/partition/core/ColorUtils.cpp

@@ -16,9 +16,9 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <ColorUtils.h>
+#include <core/ColorUtils.h>
 
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/partition.h>

src/modules/partition/core/DeviceModel.cpp

@@ -15,8 +15,9 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <DeviceModel.h>
+#include <core/DeviceModel.h>
-#include <PartitionModel.h>
+
+#include <core/PartitionModel.h>
 
 // CalaPM
 #include <core/device.h>

src/modules/partition/core/PMUtils.cpp

@@ -16,10 +16,10 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
-#include <PartitionIterator.h>
+#include <core/PartitionIterator.h>
 
 // CalaPM
 #include <core/partition.h>

src/modules/partition/core/PartitionCoreModule.cpp

@@ -16,20 +16,21 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionCoreModule.h>
+#include <core/PartitionCoreModule.h>
+
+#include <core/BootLoaderModel.h>
+#include <core/DeviceModel.h>
+#include <core/PartitionInfo.h>
+#include <core/PartitionIterator.h>
+#include <core/PartitionModel.h>
+#include <core/PMUtils.h>
+#include <jobs/CreatePartitionJob.h>
+#include <jobs/CreatePartitionTableJob.h>
+#include <jobs/DeletePartitionJob.h>
+#include <jobs/FillGlobalStorageJob.h>
+#include <jobs/FormatPartitionJob.h>
+#include <jobs/ResizePartitionJob.h>
 
-#include <BootLoaderModel.h>
-#include <CreatePartitionJob.h>
-#include <CreatePartitionTableJob.h>
-#include <DeletePartitionJob.h>
-#include <FillGlobalStorageJob.h>
-#include <FormatPartitionJob.h>
-#include <DeviceModel.h>
-#include <PartitionInfo.h>
-#include <PartitionIterator.h>
-#include <PartitionModel.h>
-#include <PMUtils.h>
-#include <ResizePartitionJob.h>
 #include <Typedefs.h>
 #include <utils/Logger.h>
 

src/modules/partition/core/PartitionCoreModule.h

@@ -19,7 +19,7 @@
 #ifndef PARTITIONCOREMODULE_H
 #define PARTITIONCOREMODULE_H
 
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 #include <Typedefs.h>
 
 // CalaPM

src/modules/partition/core/PartitionInfo.cpp

@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
 
 // CalaPM
 #include <core/partition.h>

src/modules/partition/core/PartitionIterator.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionIterator.h>
+#include <core/PartitionIterator.h>
 
 // CalaPM
 #include <core/device.h>

src/modules/partition/core/PartitionModel.cpp

@@ -15,11 +15,11 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 
-#include <ColorUtils.h>
+#include <core/ColorUtils.h>
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 #include <utils/Logger.h>
 
 // CalaPM

src/modules/partition/gui/CreatePartitionDialog.cpp

@@ -16,13 +16,15 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionDialog.h>
+#include <gui/CreatePartitionDialog.h>
+
+#include <core/ColorUtils.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
-#include <PartitionInfo.h>
-#include <PartitionSizeController.h>
-#include <PMUtils.h>
 #include <ui_CreatePartitionDialog.h>
+
 #include <utils/Logger.h>
 
 // CalaPM

src/modules/partition/gui/EditExistingPartitionDialog.cpp

@@ -16,14 +16,16 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <EditExistingPartitionDialog.h>
+#include <gui/EditExistingPartitionDialog.h>
+
+#include <core/ColorUtils.h>
+#include <core/PartitionCoreModule.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
-#include <PartitionCoreModule.h>
-#include <PartitionInfo.h>
-#include <PartitionSizeController.h>
-#include <PMUtils.h>
 #include <ui_EditExistingPartitionDialog.h>
+
 #include <utils/Logger.h>
 
 // CalaPM

src/modules/partition/gui/PartitionPage.cpp

@@ -19,13 +19,14 @@
 #include "PartitionPage.h"
 
 // Local
-#include <BootLoaderModel.h>
+#include <core/BootLoaderModel.h>
-#include <CreatePartitionDialog.h>
+#include <core/DeviceModel.h>
-#include <EditExistingPartitionDialog.h>
+#include <core/PartitionCoreModule.h>
-#include <DeviceModel.h>
+#include <core/PartitionModel.h>
-#include <PartitionCoreModule.h>
+#include <core/PMUtils.h>
-#include <PartitionModel.h>
+#include <gui/CreatePartitionDialog.h>
-#include <PMUtils.h>
+#include <gui/EditExistingPartitionDialog.h>
+
 #include <ui_PartitionPage.h>
 #include <ui_CreatePartitionTableDialog.h>
 

src/modules/partition/gui/PartitionPage.ui

@@ -177,7 +177,7 @@
   <customwidget>
    <class>PartitionPreview</class>
    <extends>QFrame</extends>
-   <header location="global">PartitionPreview.h</header>
+   <header location="global">gui/PartitionPreview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

src/modules/partition/gui/PartitionPreview.cpp

@@ -15,9 +15,9 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionPreview.h>
+#include <gui/PartitionPreview.h>
 
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 
 // Qt
 #include <QDebug>

src/modules/partition/gui/PartitionSizeController.cpp

@@ -16,9 +16,9 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionSizeController.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
+#include <core/ColorUtils.h>
 
 // Qt
 #include <QSpinBox>

src/modules/partition/gui/PartitionViewStep.cpp

@@ -16,13 +16,13 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionViewStep.h>
+#include <gui/PartitionViewStep.h>
 
-#include <DeviceModel.h>
+#include <core/DeviceModel.h>
-#include <PartitionCoreModule.h>
+#include <core/PartitionCoreModule.h>
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
-#include <PartitionPage.h>
+#include <gui/PartitionPage.h>
-#include <PartitionPreview.h>
+#include <gui/PartitionPreview.h>
 
 // Qt
 #include <QFormLayout>

src/modules/partition/jobs/CheckFileSystemJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CheckFileSystemJob.h>
+#include <jobs/CheckFileSystemJob.h>
 
 // CalaPM
 #include <core/partition.h>

src/modules/partition/jobs/CheckFileSystemJob.h

@@ -19,7 +19,7 @@
 #ifndef CHECKFILESYSTEMJOB_H
 #define CHECKFILESYSTEMJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 /**
  * Runs a file system check on an existing partition.

src/modules/partition/jobs/CreatePartitionJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionJob.h>
+#include <jobs/CreatePartitionJob.h>
 
 #include <utils/Logger.h>
 

src/modules/partition/jobs/CreatePartitionJob.h

@@ -19,7 +19,7 @@
 #ifndef CREATEPARTITIONJOB_H
 #define CREATEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;

src/modules/partition/jobs/CreatePartitionTableJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionTableJob.h>
+#include <jobs/CreatePartitionTableJob.h>
 
 #include <utils/Logger.h>
 

src/modules/partition/jobs/DeletePartitionJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <DeletePartitionJob.h>
+#include <jobs/DeletePartitionJob.h>
 
 // CalaPM
 #include <backend/corebackend.h>

src/modules/partition/jobs/DeletePartitionJob.h

@@ -19,7 +19,7 @@
 #ifndef DELETEPARTITIONJOB_H
 #define DELETEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;

src/modules/partition/jobs/FillGlobalStorageJob.cpp

@@ -16,13 +16,13 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <FillGlobalStorageJob.h>
+#include <jobs/FillGlobalStorageJob.h>
 
 #include <GlobalStorage.h>
 #include <JobQueue.h>
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
-#include <PartitionIterator.h>
+#include <core/PartitionIterator.h>
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/device.h>

src/modules/partition/jobs/FormatPartitionJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <FormatPartitionJob.h>
+#include <jobs/FormatPartitionJob.h>
 
 #include <utils/Logger.h>
 

src/modules/partition/jobs/FormatPartitionJob.h

@@ -19,7 +19,7 @@
 #ifndef FORMATPARTITIONJOB_H
 #define FORMATPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;

src/modules/partition/jobs/MoveFileSystemJob.cpp

@@ -40,7 +40,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <MoveFileSystemJob.h>
+#include <jobs/MoveFileSystemJob.h>
 
 #include <utils/Logger.h>
 

src/modules/partition/jobs/MoveFileSystemJob.h

@@ -40,7 +40,7 @@
 #ifndef MOVEFILESYSTEMJOB_H
 #define MOVEFILESYSTEMJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class CopySourceDevice;
 class CopyTargetDevice;

src/modules/partition/jobs/PartitionJob.cpp

@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 PartitionJob::PartitionJob( Partition* partition )
     : m_partition( partition )

src/modules/partition/jobs/ResizePartitionJob.cpp

@@ -38,10 +38,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <ResizePartitionJob.h>
+#include <jobs/ResizePartitionJob.h>
 
-#include <CheckFileSystemJob.h>
+#include <jobs/CheckFileSystemJob.h>
-#include <MoveFileSystemJob.h>
+#include <jobs/MoveFileSystemJob.h>
 #include <utils/Logger.h>
 
 // CalaPM

src/modules/partition/jobs/ResizePartitionJob.h

@@ -19,7 +19,7 @@
 #ifndef RESIZEPARTITIONJOB_H
 #define RESIZEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;

src/modules/partition/tests/CMakeLists.txt

@@ -2,16 +2,16 @@ find_package( Qt5 COMPONENTS Test REQUIRED )
 include( ECMAddTests )
 
 set( jobtests_SRCS
-    ${PartitionModule_SOURCE_DIR}/CheckFileSystemJob.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PMUtils.cpp
-    ${PartitionModule_SOURCE_DIR}/CreatePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
-    ${PartitionModule_SOURCE_DIR}/CreatePartitionTableJob.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp
-    ${PartitionModule_SOURCE_DIR}/DeletePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CheckFileSystemJob.cpp
-    ${PartitionModule_SOURCE_DIR}/MoveFileSystemJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionInfo.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionIterator.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/MoveFileSystemJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PMUtils.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/ResizePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
     JobTests.cpp
 )
 

src/modules/partition/tests/JobTests.cpp

@@ -1,9 +1,9 @@
 #include <JobTests.h>
 
-#include <CreatePartitionJob.h>
+#include <jobs/CreatePartitionJob.h>
-#include <CreatePartitionTableJob.h>
+#include <jobs/CreatePartitionTableJob.h>
-#include <ResizePartitionJob.h>
+#include <jobs/ResizePartitionJob.h>
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <CalaPM.h>