libcalamares: rename CalamaresUtilsSystem and Gui

src/calamares/CalamaresApplication.cpp

@@ -20,8 +20,8 @@
 #include "ViewManager.h"
 #include "locale/TranslationsModel.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Gui.h"
+#include "utils/System.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #ifdef WITH_QML

src/calamares/CalamaresWindow.cpp

@@ -19,7 +19,7 @@
 #include "Settings.h"
 #include "ViewManager.h"
 #include "progresstree/ProgressTreeView.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Qml.h"
 #include "utils/Retranslator.h"

src/calamares/DebugWindow.cpp

@@ -21,7 +21,7 @@
 #include "VariantModel.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Paste.h"
 #include "utils/Retranslator.h"

src/calamares/progresstree/ProgressTreeDelegate.cpp

@@ -14,7 +14,7 @@
 #include "CalamaresApplication.h"
 #include "CalamaresWindow.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QPainter>
 

src/libcalamares/CMakeLists.txt

@@ -77,7 +77,6 @@ add_library(
     partition/PartitionSize.cpp
     partition/Sync.cpp
     # Utility service
-    utils/CalamaresUtilsSystem.cpp
     utils/CommandList.cpp
     utils/Dirs.cpp
     utils/Entropy.cpp
@@ -88,6 +87,7 @@ add_library(
     utils/Runner.cpp
     utils/String.cpp
     utils/StringExpander.cpp
+    utils/System.cpp
     utils/UMask.cpp
     utils/Variant.cpp
     utils/Yaml.cpp

src/libcalamares/ProcessJob.cpp

@@ -10,7 +10,7 @@
 
 #include "ProcessJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>

src/libcalamares/PythonJobApi.cpp

@@ -15,7 +15,7 @@
 #include "PythonHelper.h"
 #include "locale/Global.h"
 #include "partition/Mount.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 #include "utils/Runner.h"

src/libcalamares/partition/Mount.cpp

@@ -12,7 +12,7 @@
 #include "Mount.h"
 
 #include "partition/Sync.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
 

src/libcalamares/partition/Sync.cpp

@@ -10,7 +10,7 @@
 
 #include "Sync.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 void

src/libcalamares/utils/CommandList.cpp

@@ -14,7 +14,7 @@
 #include "JobQueue.h"
 
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/StringExpander.h"
 #include "utils/Variant.h"

src/libcalamares/utils/Permissions.cpp

@@ -7,7 +7,7 @@
 
 #include "Permissions.h"
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "Logger.h"
 
 #include <QString>

src/libcalamares/utils/Runner.h

@@ -11,7 +11,7 @@
 #ifndef UTILS_RUNNER_H
 #define UTILS_RUNNER_H
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 
 #include <QDir>
 #include <QObject>

src/libcalamares/utils/System.cpp

@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"

src/libcalamares/utils/TestPaths.cpp

@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "Entropy.h"
 #include "Logger.h"
 #include "UMask.h"

src/libcalamares/utils/Tests.cpp

@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "CommandList.h"
 #include "Entropy.h"
 #include "Logger.h"

src/libcalamaresui/Branding.cpp

@@ -14,7 +14,7 @@
 #include "Branding.h"
 
 #include "GlobalStorage.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"

src/libcalamaresui/CMakeLists.txt

@@ -16,7 +16,7 @@ set(calamaresui_SOURCES
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
     modulesystem/ViewModule.cpp
-    utils/CalamaresUtilsGui.cpp
+    utils/Gui.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
     viewpages/BlankViewStep.cpp

src/libcalamaresui/utils/Gui.cpp

@@ -8,7 +8,7 @@
  *
  */
 
-#include "CalamaresUtilsGui.h"
+#include "Gui.h"
 
 #include "ImageRegistry.h"
 

src/libcalamaresui/utils/ImageRegistry.h

@@ -12,7 +12,7 @@
 #include <QPixmap>
 
 #include "DllMacro.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 class UIDLLEXPORT ImageRegistry
 {

src/libcalamaresui/viewpages/BlankViewStep.cpp

@@ -8,7 +8,7 @@
  */
 #include "BlankViewStep.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QLabel>
 #include <QVBoxLayout>

src/libcalamaresui/viewpages/ExecutionViewStep.cpp

@@ -21,7 +21,7 @@
 #include "ViewManager.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"

src/libcalamaresui/widgets/PrettyRadioButton.cpp

@@ -9,7 +9,7 @@
 
 #include "PrettyRadioButton.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "widgets/ClickableLabel.h"
 
 #include <QButtonGroup>

src/libcalamaresui/widgets/WaitingWidget.cpp

@@ -10,7 +10,7 @@
 
 #include "WaitingWidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QBoxLayout>
 #include <QLabel>

src/modules/contextualprocess/Tests.cpp

@@ -14,7 +14,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"

src/modules/dummycpp/DummyCppJob.cpp

@@ -19,7 +19,7 @@
 #include "JobQueue.h"
 
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 DummyCppJob::DummyCppJob( QObject* parent )

src/modules/hostinfo/HostInfoJob.cpp

@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 

src/modules/initcpio/InitcpioJob.cpp

@@ -10,7 +10,7 @@
 
 #include "InitcpioJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/UMask.h"
 #include "utils/Variant.h"

src/modules/initramfs/InitramfsJob.cpp

@@ -9,7 +9,7 @@
 
 #include "InitramfsJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/UMask.h"
 #include "utils/Variant.h"

src/modules/initramfs/Tests.cpp

@@ -13,7 +13,7 @@
 #include "JobQueue.h"
 #include "Settings.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 

src/modules/interactiveterminal/InteractiveTerminalPage.cpp

@@ -9,7 +9,7 @@
 
 #include "InteractiveTerminalPage.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ViewStep.h"

src/modules/keyboard/SetKeyboardLayoutJob.cpp

@@ -19,7 +19,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
 

src/modules/license/LicensePage.cpp

@@ -19,7 +19,7 @@
 #include "JobQueue.h"
 #include "ViewManager.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"

src/modules/locale/LocalePage.cpp

@@ -14,7 +14,7 @@
 #include "LCLocaleDialog.h"
 #include "timezonewidget/timezonewidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 #include "utils/Retranslator.h"

src/modules/locale/LocaleViewStep.cpp

@@ -17,7 +17,7 @@
 
 #include "geoip/Handler.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 #include "utils/Yaml.h"

src/modules/locale/SetTimezoneJob.cpp

@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>

src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp

@@ -7,7 +7,7 @@
 
 #include "LuksBootKeyFileJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"

src/modules/luksopenswaphookcfg/LOSHJob.cpp

@@ -10,7 +10,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 #include "utils/PluginFactory.h"

src/modules/luksopenswaphookcfg/Tests.cpp

@@ -10,7 +10,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QtTest/QtTest>

src/modules/machineid/MachineIdJob.cpp

@@ -13,7 +13,7 @@
 #include "MachineIdJob.h"
 #include "Workers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/machineid/Tests.cpp

@@ -12,7 +12,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>

src/modules/machineid/Workers.cpp

@@ -12,7 +12,7 @@
 
 #include "Workers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 

src/modules/notesqml/NotesQmlViewStep.h

@@ -11,7 +11,7 @@
 
 #include "DllMacro.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/PluginFactory.h"
 #include "utils/Variant.h"
 #include "viewpages/QmlViewStep.h"

src/modules/packagechooser/PackageChooserPage.cpp

@@ -11,7 +11,7 @@
 
 #include "ui_page_package.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 

src/modules/packagechooser/PackageChooserViewStep.cpp

@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/partition/PartitionViewStep.cpp

@@ -25,7 +25,7 @@
 #include "Branding.h"
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"

src/modules/partition/core/DeviceList.cpp

@@ -11,7 +11,7 @@
 #include "DeviceList.h"
 
 #include "partition/PartitionIterator.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/backend/corebackend.h>

src/modules/partition/core/DeviceModel.cpp

@@ -13,7 +13,7 @@
 #include "core/PartitionModel.h"
 #include "core/SizeUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 // KPMcore

src/modules/partition/core/PartUtils.cpp

@@ -20,7 +20,7 @@
 #include "partition/Mount.h"
 #include "partition/PartitionIterator.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 

src/modules/partition/core/PartitionActions.cpp

@@ -18,7 +18,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Units.h"

src/modules/partition/gui/BootInfoWidget.cpp

@@ -10,7 +10,7 @@
 #include "BootInfoWidget.h"
 #include "core/PartUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 

src/modules/partition/gui/ChoicePage.cpp

@@ -36,7 +36,7 @@
 #include "JobQueue.h"
 #include "partition/PartitionIterator.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/Units.h"

src/modules/partition/gui/DeviceInfoWidget.cpp

@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"

src/modules/partition/gui/EncryptWidget.cpp

@@ -14,7 +14,7 @@
 #include "ui_EncryptWidget.h"
 
 #include "Branding.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Retranslator.h"
 
 constexpr int ZFS_MIN_LENGTH = 8;

src/modules/partition/gui/PartitionBarsView.cpp

@@ -12,7 +12,7 @@
 #include "core/ColorUtils.h"
 #include "core/PartitionModel.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/core/device.h>

src/modules/partition/gui/PartitionLabelsView.cpp

@@ -14,7 +14,7 @@
 #include "core/PartitionModel.h"
 #include "core/SizeUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 

src/modules/partition/gui/PartitionSplitterWidget.cpp

@@ -16,7 +16,7 @@
 #include "partition/PartitionQuery.h"
 #include "utils/Logger.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>

src/modules/partition/jobs/CreatePartitionJob.cpp

@@ -16,7 +16,7 @@
 
 #include "partition/FileSystem.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 

src/modules/partition/jobs/CreatePartitionTableJob.cpp

@@ -12,7 +12,7 @@
 #include "CreatePartitionTableJob.h"
 
 #include "partition/PartitionIterator.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include "core/KPMHelpers.h"

src/modules/partition/jobs/DeletePartitionJob.cpp

@@ -13,7 +13,7 @@
 
 #include "core/KPMHelpers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>

src/modules/partition/jobs/FormatPartitionJob.cpp

@@ -14,7 +14,7 @@
 #include "core/KPMHelpers.h"
 
 #include "partition/FileSystem.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/core/device.h>

src/modules/plasmalnf/Config.cpp

@@ -12,7 +12,7 @@
 #include "PlasmaLnfJob.h"
 #include "ThemeInfo.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/plasmalnf/PlasmaLnfJob.cpp

@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #ifdef WITH_KCONFIG

src/modules/plasmalnf/ThemeInfo.cpp

@@ -9,7 +9,7 @@
 #include "ThemeInfo.h"
 
 #include "Branding.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 #include <KPackage/Package>

src/modules/preservefiles/Item.cpp

@@ -10,7 +10,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 #include "utils/Variant.h"

src/modules/preservefiles/PreserveFiles.cpp

@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
 #include "utils/StringExpander.h"

src/modules/preservefiles/Tests.cpp

@@ -10,7 +10,7 @@
 #include "Item.h"
 
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Yaml.h"

src/modules/removeuser/RemoveUserJob.cpp

@@ -13,7 +13,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/summary/Config.cpp

@@ -13,7 +13,7 @@
 #include "Branding.h"
 #include "Settings.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ExecutionViewStep.h"

src/modules/summary/SummaryPage.cpp

@@ -17,7 +17,7 @@
 #include "Settings.h"
 #include "ViewManager.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"

src/modules/tracking/TrackingJobs.cpp

@@ -14,7 +14,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <KMacroExpander>

src/modules/tracking/TrackingPage.cpp

@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 

src/modules/tracking/TrackingViewStep.cpp

@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/umount/Tests.cpp

@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>

src/modules/umount/UmountJob.cpp

@@ -15,7 +15,7 @@
 #include "UmountJob.h"
 
 #include "partition/Mount.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

src/modules/users/CreateUserJob.cpp

@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 

src/modules/users/MiscJobs.cpp

@@ -14,7 +14,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 

src/modules/users/SetHostNameJob.cpp

@@ -13,7 +13,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDBusConnection>

src/modules/users/SetPasswordJob.cpp

@@ -12,7 +12,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 

src/modules/users/TestSetHostNameJob.cpp

@@ -16,7 +16,7 @@ extern bool setSystemdHostname( const QString& );
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 

src/modules/users/UsersPage.cpp

@@ -22,7 +22,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/String.h"

src/modules/welcome/Tests.cpp

@@ -12,7 +12,7 @@
 #include "Branding.h"
 #include "Settings.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 

src/modules/welcome/WelcomePage.cpp

@@ -23,7 +23,7 @@
 
 #include "modulesystem/ModuleManager.h"
 #include "modulesystem/RequirementsModel.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"

src/modules/welcome/checker/CheckerContainer.cpp

@@ -15,7 +15,7 @@
 
 #include "ResultsListWidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "widgets/WaitingWidget.h"

src/modules/welcome/checker/GeneralRequirements.cpp

@@ -22,8 +22,8 @@
 #include "compat/Variant.h"
 #include "modulesystem/Requirement.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Gui.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/Units.h"

src/modules/welcome/checker/ResultDelegate.cpp

@@ -10,7 +10,7 @@
 #include "ResultDelegate.h"
 
 #include "modulesystem/RequirementsModel.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QApplication>
 #include <QPainter>

src/modules/welcome/checker/ResultsListWidget.cpp

@@ -14,7 +14,7 @@
 
 #include "Branding.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "widgets/FixedAspectRatioLabel.h"

src/modules/zfs/ZfsJob.cpp

@@ -9,7 +9,7 @@
 
 #include "ZfsJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"