From 090aee91960f77df8f2fa4fdee25cfa6b23fc269 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Apr 2019 05:51:27 -0400 Subject: [PATCH] Modules: adjust to split-out utils/Variant.h - Most modules only needed the variant support, not the "whole" CalamaresUtils header. - While here improve ordering of headers as well. --- .../contextualprocess/ContextualProcessJob.cpp | 2 +- src/modules/fsresizer/ResizeFSJob.cpp | 2 +- src/modules/license/LicensePage.cpp | 2 +- src/modules/locale/GeoIPJSON.cpp | 2 +- src/modules/locale/LocaleViewStep.cpp | 2 +- src/modules/netinstall/NetInstallViewStep.cpp | 2 +- src/modules/partition/core/PartitionCoreModule.cpp | 3 ++- src/modules/partition/gui/PartitionViewStep.cpp | 11 +++++++---- src/modules/plasmalnf/PlasmaLnfViewStep.cpp | 2 +- src/modules/shellprocess/ShellProcessJob.cpp | 3 +-- src/modules/tracking/TrackingViewStep.cpp | 14 ++++++++------ src/modules/users/UsersViewStep.cpp | 3 ++- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/modules/contextualprocess/ContextualProcessJob.cpp b/src/modules/contextualprocess/ContextualProcessJob.cpp index d79297029..428e54cd5 100644 --- a/src/modules/contextualprocess/ContextualProcessJob.cpp +++ b/src/modules/contextualprocess/ContextualProcessJob.cpp @@ -26,9 +26,9 @@ #include "JobQueue.h" #include "GlobalStorage.h" -#include "utils/CalamaresUtils.h" #include "utils/CommandList.h" #include "utils/Logger.h" +#include "utils/Variant.h" struct ValueCheck : public QPair { diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index a44815345..c8224a4c4 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -33,9 +33,9 @@ #include "JobQueue.h" #include "GlobalStorage.h" -#include "utils/CalamaresUtils.h" #include "utils/Logger.h" #include "utils/Units.h" +#include "utils/Variant.h" #include "modules/partition/core/PartitionIterator.h" diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp index f52c68f63..3c241e467 100644 --- a/src/modules/license/LicensePage.cpp +++ b/src/modules/license/LicensePage.cpp @@ -28,11 +28,11 @@ #include "GlobalStorage.h" #include "ViewManager.h" -#include "utils/CalamaresUtils.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Retranslator.h" +#include "utils/Variant.h" #include #include diff --git a/src/modules/locale/GeoIPJSON.cpp b/src/modules/locale/GeoIPJSON.cpp index d6a309af7..81e0ff0e7 100644 --- a/src/modules/locale/GeoIPJSON.cpp +++ b/src/modules/locale/GeoIPJSON.cpp @@ -19,8 +19,8 @@ #include "GeoIPJSON.h" -#include "utils/CalamaresUtils.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include "utils/YamlUtils.h" #include diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index b78365dc2..c432f84d6 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -31,9 +31,9 @@ #include "timezonewidget/localeglobal.h" #include "widgets/WaitingWidget.h" -#include "utils/CalamaresUtils.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include "utils/YamlUtils.h" #include diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index 9964dcec3..fcb76be5a 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -23,8 +23,8 @@ #include "JobQueue.h" #include "GlobalStorage.h" -#include "utils/CalamaresUtils.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include "NetInstallPage.h" diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index e042b23e2..183fdfcac 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -44,7 +44,8 @@ #include "jobs/ResizePartitionJob.h" #include "jobs/ResizeVolumeGroupJob.h" #include "jobs/SetPartitionFlagsJob.h" -#include "utils/CalamaresUtils.h" + +#include "utils/Variant.h" #ifdef DEBUG_PARTITION_LAME #include "JobExample.h" diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 02d289518..2e186b3a8 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -33,16 +33,19 @@ #include "gui/PartitionBarsView.h" #include "gui/PartitionLabelsView.h" +#include "Branding.h" #include "CalamaresVersion.h" +#include "GlobalStorage.h" +#include "Job.h" +#include "JobQueue.h" + #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Retranslator.h" +#include "utils/Variant.h" #include "widgets/WaitingWidget.h" -#include "GlobalStorage.h" -#include "JobQueue.h" -#include "Job.h" -#include "Branding.h" + #include #include diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp index 5525f36fc..ec5258c64 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp @@ -21,8 +21,8 @@ #include "PlasmaLnfPage.h" #include "ThemeInfo.h" -#include "utils/CalamaresUtils.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include #include diff --git a/src/modules/shellprocess/ShellProcessJob.cpp b/src/modules/shellprocess/ShellProcessJob.cpp index 19c7bc8f1..d688540ae 100644 --- a/src/modules/shellprocess/ShellProcessJob.cpp +++ b/src/modules/shellprocess/ShellProcessJob.cpp @@ -26,10 +26,9 @@ #include "JobQueue.h" #include "GlobalStorage.h" -#include "utils/CalamaresUtils.h" -#include "utils/CalamaresUtilsSystem.h" #include "utils/CommandList.h" #include "utils/Logger.h" +#include "utils/Variant.h" ShellProcessJob::ShellProcessJob( QObject* parent ) : Calamares::CppJob( parent ) diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp index 412156833..cb48b340b 100644 --- a/src/modules/tracking/TrackingViewStep.cpp +++ b/src/modules/tracking/TrackingViewStep.cpp @@ -16,15 +16,17 @@ * along with Calamares. If not, see . */ -#include "JobQueue.h" -#include "GlobalStorage.h" -#include "utils/Logger.h" -#include "utils/CalamaresUtils.h" -#include "utils/CalamaresUtilsSystem.h" +#include "TrackingViewStep.h" #include "TrackingJobs.h" #include "TrackingPage.h" -#include "TrackingViewStep.h" + +#include "JobQueue.h" +#include "GlobalStorage.h" + +#include "utils/Logger.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Variant.h" #include #include diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index 3b1e6a5ad..4582a9e85 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -22,8 +22,9 @@ #include "UsersPage.h" -#include "utils/CalamaresUtils.h" +// #include "utils/CalamaresUtils.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include "GlobalStorage.h" #include "JobQueue.h"