napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcalamares: rename CalamaresUtilsSystem and Gui

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-11 20:38:55 +02:00
parent eb840d4117
commit 1efb12e332
90 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calamares/CalamaresApplication.cpp
View File

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

2
src/calamares/CalamaresWindow.cpp
View File

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

2
src/calamares/DebugWindow.cpp
View File

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

2
src/calamares/progresstree/ProgressTreeDelegate.cpp
View File

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

2
src/libcalamares/CMakeLists.txt
View File

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

2
src/libcalamares/ProcessJob.cpp
View File

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

2
src/libcalamares/PythonJobApi.cpp
View File

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

2
src/libcalamares/partition/Mount.cpp
View File

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

2
src/libcalamares/partition/Sync.cpp
View File

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

2
src/libcalamares/utils/CommandList.cpp
View File

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

2
src/libcalamares/utils/Permissions.cpp
View File

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

2
src/libcalamares/utils/Runner.h
View File

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

2
src/libcalamares/utils/CalamaresUtilsSystem.cpp → src/libcalamares/utils/System.cpp
View File

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

0
src/libcalamares/utils/CalamaresUtilsSystem.h → src/libcalamares/utils/System.h
View File

2
src/libcalamares/utils/TestPaths.cpp
View File

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

2
src/libcalamares/utils/Tests.cpp
View File

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

2
src/libcalamaresui/Branding.cpp
View File

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

2
src/libcalamaresui/CMakeLists.txt
View File

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

2
src/libcalamaresui/utils/CalamaresUtilsGui.cpp → src/libcalamaresui/utils/Gui.cpp
View File

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

0
src/libcalamaresui/utils/CalamaresUtilsGui.h → src/libcalamaresui/utils/Gui.h
View File

2
src/libcalamaresui/utils/ImageRegistry.h
View File

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

2
src/libcalamaresui/viewpages/BlankViewStep.cpp
View File

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

2
src/libcalamaresui/viewpages/ExecutionViewStep.cpp
View File

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

2
src/libcalamaresui/widgets/PrettyRadioButton.cpp
View File

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

2
src/libcalamaresui/widgets/WaitingWidget.cpp
View File

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

2
src/modules/contextualprocess/Tests.cpp
View File

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

2
src/modules/dummycpp/DummyCppJob.cpp
View File

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

2
src/modules/hostinfo/HostInfoJob.cpp
View File

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

2
src/modules/initcpio/InitcpioJob.cpp
View File

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

2
src/modules/initramfs/InitramfsJob.cpp
View File

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

2
src/modules/initramfs/Tests.cpp
View File

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

2
src/modules/interactiveterminal/InteractiveTerminalPage.cpp
View File

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

2
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View File

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

2
src/modules/license/LicensePage.cpp
View File

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

2
src/modules/locale/LocalePage.cpp
View File

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

2
src/modules/locale/LocaleViewStep.cpp
View File

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

2
src/modules/locale/SetTimezoneJob.cpp
View File

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

2
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
View File

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

2
src/modules/luksopenswaphookcfg/LOSHJob.cpp
View File

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

2
src/modules/luksopenswaphookcfg/Tests.cpp
View File

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

2
src/modules/machineid/MachineIdJob.cpp
View File

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

2
src/modules/machineid/Tests.cpp
View File

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

2
src/modules/machineid/Workers.cpp
View File

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

2
src/modules/notesqml/NotesQmlViewStep.h
View File

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

2
src/modules/packagechooser/PackageChooserPage.cpp
View File

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

2
src/modules/packagechooser/PackageChooserViewStep.cpp
View File

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

2
src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
View File

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

2
src/modules/partition/PartitionViewStep.cpp
View File

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

2
src/modules/partition/core/DeviceList.cpp
View File

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

2
src/modules/partition/core/DeviceModel.cpp
View File

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

2
src/modules/partition/core/PartUtils.cpp
View File

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

2
src/modules/partition/core/PartitionActions.cpp
View File

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

2
src/modules/partition/gui/BootInfoWidget.cpp
View File

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

2
src/modules/partition/gui/ChoicePage.cpp
View File

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

2
src/modules/partition/gui/DeviceInfoWidget.cpp
View File

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

2
src/modules/partition/gui/EncryptWidget.cpp
View File

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

2
src/modules/partition/gui/PartitionBarsView.cpp
View File

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

2
src/modules/partition/gui/PartitionLabelsView.cpp
View File

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

2
src/modules/partition/gui/PartitionSplitterWidget.cpp
View File

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

2
src/modules/partition/jobs/CreatePartitionJob.cpp
View File

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

2
src/modules/partition/jobs/CreatePartitionTableJob.cpp
View File

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

2
src/modules/partition/jobs/DeletePartitionJob.cpp
View File

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

2
src/modules/partition/jobs/FormatPartitionJob.cpp
View File

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

2
src/modules/plasmalnf/Config.cpp
View File

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

2
src/modules/plasmalnf/PlasmaLnfJob.cpp
View File

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

2
src/modules/plasmalnf/ThemeInfo.cpp
View File

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

2
src/modules/preservefiles/Item.cpp
View File

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

2
src/modules/preservefiles/PreserveFiles.cpp
View File

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

2
src/modules/preservefiles/Tests.cpp
View File

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

2
src/modules/removeuser/RemoveUserJob.cpp
View File

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

2
src/modules/summary/Config.cpp
View File

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

2
src/modules/summary/SummaryPage.cpp
View File

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

2
src/modules/tracking/TrackingJobs.cpp
View File

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

2
src/modules/tracking/TrackingPage.cpp
View File

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

2
src/modules/tracking/TrackingViewStep.cpp
View File

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

2
src/modules/umount/Tests.cpp
View File

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

2
src/modules/umount/UmountJob.cpp
View File

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

2
src/modules/users/CreateUserJob.cpp
View File

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

2
src/modules/users/MiscJobs.cpp
View File

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

2
src/modules/users/SetHostNameJob.cpp
View File

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

2
src/modules/users/SetPasswordJob.cpp
View File

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

2
src/modules/users/TestSetHostNameJob.cpp
View File

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

2
src/modules/users/UsersPage.cpp
View File

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

2
src/modules/welcome/Tests.cpp
View File

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

2
src/modules/welcome/WelcomePage.cpp
View File

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

2
src/modules/welcome/checker/CheckerContainer.cpp
View File

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

4
src/modules/welcome/checker/GeneralRequirements.cpp
View File

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

2
src/modules/welcome/checker/ResultDelegate.cpp
View File

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

2
src/modules/welcome/checker/ResultsListWidget.cpp
View File

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

2
src/modules/zfs/ZfsJob.cpp
View File

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