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.

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<QString, CalamaresUtils::CommandList*>
 {

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"
 

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 <QApplication>
 #include <QBoxLayout>

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 <QByteArray>

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 <QBoxLayout>

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"
 

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"

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 <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>

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 <QProcess>
 #include <QVariantMap>

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 )

src/modules/tracking/TrackingViewStep.cpp

@@ -16,15 +16,17 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 <QDesktopServices>
 #include <QVariantMap>

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"