From 63b0589382eee488710560354d11be8741c6e3a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 17 Oct 2023 22:24:46 +0200 Subject: [PATCH] CI: apply style tool across the entire codebase --- src/calamares/CalamaresApplication.cpp | 6 ++-- src/calamares/CalamaresWindow.cpp | 27 +++++++-------- src/libcalamares/ProcessJob.cpp | 6 +++- src/libcalamares/PythonJobApi.cpp | 2 +- src/libcalamares/Settings.cpp | 2 ++ src/libcalamares/locale/TranslationsModel.cpp | 2 ++ src/libcalamares/modulesystem/Module.cpp | 2 ++ src/libcalamares/partition/Mount.cpp | 2 +- src/libcalamares/partition/PartitionQuery.cpp | 4 +++ src/libcalamares/partition/Sync.cpp | 2 +- src/libcalamares/python/Api.h | 2 +- src/libcalamares/python/Pybind11Helpers.h | 2 +- src/libcalamares/utils/CommandList.cpp | 2 +- src/libcalamares/utils/Logger.cpp | 2 ++ src/libcalamares/utils/NamedEnum.h | 4 +++ src/libcalamares/utils/NamedSuffix.h | 2 ++ src/libcalamares/utils/Permissions.cpp | 2 +- src/libcalamares/utils/PluginFactory.h | 4 ++- src/libcalamares/utils/System.cpp | 12 ++++++- src/libcalamares/utils/TestPaths.cpp | 2 +- src/libcalamares/utils/Tests.cpp | 4 ++- src/libcalamaresui/Branding.cpp | 4 +++ .../modulesystem/ModuleManager.cpp | 2 ++ src/libcalamaresui/utils/Qml.cpp | 2 ++ src/libcalamaresui/viewpages/QmlViewStep.h | 2 +- src/modules/contextualprocess/Tests.cpp | 2 +- src/modules/dummycpp/DummyCppJob.cpp | 2 +- src/modules/fsresizer/ResizeFSJob.cpp | 8 +++++ src/modules/hostinfo/HostInfoJob.cpp | 2 +- src/modules/initcpio/InitcpioJob.cpp | 2 +- src/modules/initramfs/InitramfsJob.cpp | 2 +- src/modules/initramfs/Tests.cpp | 2 +- src/modules/keyboard/SetKeyboardLayoutJob.cpp | 33 ++++++++++--------- src/modules/locale/Config.h | 3 +- src/modules/locale/SetTimezoneJob.cpp | 8 ++++- src/modules/locale/Tests.cpp | 3 +- .../luksbootkeyfile/LuksBootKeyFileJob.cpp | 2 +- src/modules/luksopenswaphookcfg/LOSHJob.cpp | 2 +- src/modules/luksopenswaphookcfg/Tests.cpp | 2 +- src/modules/machineid/MachineIdJob.cpp | 2 +- src/modules/machineid/Tests.cpp | 2 +- src/modules/machineid/Workers.cpp | 2 +- src/modules/netinstall/PackageTreeItem.cpp | 2 ++ src/modules/notesqml/NotesQmlViewStep.h | 2 +- src/modules/oemid/IDJob.cpp | 2 ++ .../packagechooser/PackageChooserViewStep.cpp | 2 +- .../PackageChooserQmlViewStep.cpp | 2 +- src/modules/partition/core/ColorUtils.cpp | 2 ++ src/modules/partition/core/DeviceList.cpp | 4 ++- src/modules/partition/core/KPMHelpers.h | 3 +- src/modules/partition/core/PartUtils.cpp | 6 +++- .../partition/core/PartitionActions.cpp | 2 +- .../partition/core/PartitionCoreModule.cpp | 15 +++++++-- src/modules/partition/core/PartitionModel.cpp | 13 ++++++-- src/modules/partition/gui/ChoicePage.cpp | 10 ++++++ .../partition/gui/CreatePartitionDialog.cpp | 21 ++++++------ .../partition/gui/PartitionLabelsView.cpp | 2 ++ src/modules/partition/gui/PartitionPage.cpp | 4 +++ .../partition/jobs/CreatePartitionJob.cpp | 2 +- .../jobs/CreatePartitionTableJob.cpp | 2 +- .../partition/jobs/FillGlobalStorageJob.cpp | 2 +- .../partition/jobs/FormatPartitionJob.cpp | 2 +- .../partition/tests/PartitionJobTests.cpp | 2 ++ src/modules/plasmalnf/Config.cpp | 4 ++- src/modules/plasmalnf/PlasmaLnfJob.cpp | 2 +- src/modules/plasmalnf/PlasmaLnfPage.cpp | 4 +++ src/modules/preservefiles/Item.cpp | 2 +- src/modules/preservefiles/PreserveFiles.cpp | 2 +- src/modules/preservefiles/Tests.cpp | 2 +- src/modules/removeuser/RemoveUserJob.cpp | 2 +- src/modules/tracking/TrackingJobs.cpp | 2 +- src/modules/tracking/TrackingViewStep.cpp | 2 +- src/modules/umount/Tests.cpp | 2 +- src/modules/umount/UmountJob.cpp | 2 +- src/modules/users/CreateUserJob.cpp | 2 +- src/modules/users/MiscJobs.cpp | 2 +- src/modules/users/SetHostNameJob.cpp | 2 +- src/modules/users/SetPasswordJob.cpp | 8 ++++- src/modules/users/TestSetHostNameJob.cpp | 2 +- src/modules/welcome/Tests.cpp | 2 +- src/modules/welcome/WelcomeViewStep.h | 2 +- .../welcome/checker/GeneralRequirements.cpp | 4 ++- src/modules/welcomeq/WelcomeQmlViewStep.h | 2 +- src/modules/zfs/ZfsJob.cpp | 2 +- 84 files changed, 232 insertions(+), 106 deletions(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index fabf38373..6f842ff29 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -20,10 +20,10 @@ #include "ViewManager.h" #include "locale/TranslationsModel.h" #include "modulesystem/ModuleManager.h" -#include "utils/Gui.h" -#include "utils/System.h" #include "utils/Dirs.h" +#include "utils/Gui.h" #include "utils/Logger.h" +#include "utils/System.h" #ifdef WITH_QML #include "utils/Qml.h" #endif @@ -121,10 +121,12 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename ) brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename ); } if ( Calamares::haveExtraDirs() ) + { for ( auto s : Calamares::extraDataDirs() ) { brandingPaths << ( s + brandingFilename ); } + } brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename ); brandingPaths << Calamares::appDataDir().absoluteFilePath( brandingFilename ); } diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 722324846..671deb119 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -169,7 +169,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, debugWindowBtn->setIcon( Calamares::defaultPixmap( Calamares::Bugs, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( - debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug", "@button" ) ); + debugWindowBtn, + debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug", "@button" ) ); debugWindowBtn->setToolTip( QCoreApplication::translate( "calamares-sidebar", "Show debug information", "@tooltip" ) ); ); extraButtons->addWidget( debugWindowBtn ); @@ -197,10 +198,10 @@ getWidgetNavigation( Calamares::DebugWindowManager*, // Create buttons and sets an initial icon; the icons may change { - auto* back - = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back", "@button" ), - navigation ); + auto* back = new QPushButton( + getButtonIcon( QStringLiteral( "go-previous" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back", "@button" ), + navigation ); back->setObjectName( "view-button-back" ); back->setEnabled( viewManager->backEnabled() ); QObject::connect( back, &QPushButton::clicked, viewManager, &Calamares::ViewManager::back ); @@ -213,10 +214,10 @@ getWidgetNavigation( Calamares::DebugWindowManager*, bottomLayout->addWidget( back ); } { - auto* next - = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next", "@button" ), - navigation ); + auto* next = new QPushButton( + getButtonIcon( QStringLiteral( "go-next" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next", "@button" ), + navigation ); next->setObjectName( "view-button-next" ); next->setEnabled( viewManager->nextEnabled() ); QObject::connect( next, &QPushButton::clicked, viewManager, &Calamares::ViewManager::next ); @@ -230,10 +231,10 @@ getWidgetNavigation( Calamares::DebugWindowManager*, } bottomLayout->addSpacing( 12 ); { - auto* quit - = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel", "@button" ), - navigation ); + auto* quit = new QPushButton( + getButtonIcon( QStringLiteral( "dialog-cancel" ) ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel", "@button" ), + navigation ); quit->setObjectName( "view-button-cancel" ); QObject::connect( quit, &QPushButton::clicked, viewManager, &Calamares::ViewManager::quit ); QObject::connect( viewManager, &Calamares::ViewManager::quitEnabledChanged, quit, &QPushButton::setEnabled ); diff --git a/src/libcalamares/ProcessJob.cpp b/src/libcalamares/ProcessJob.cpp index 857078220..7423761a1 100644 --- a/src/libcalamares/ProcessJob.cpp +++ b/src/libcalamares/ProcessJob.cpp @@ -10,8 +10,8 @@ #include "ProcessJob.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include @@ -51,16 +51,20 @@ ProcessJob::exec() using Calamares::System; if ( m_runInChroot ) + { return Calamares::System::instance() ->targetEnvCommand( { m_command }, m_workingPath, QString(), m_timeoutSec ) .explainProcess( m_command, m_timeoutSec ); + } else + { return System::runCommand( System::RunLocation::RunInHost, { "/bin/sh", "-c", m_command }, m_workingPath, QString(), m_timeoutSec ) .explainProcess( m_command, m_timeoutSec ); + } } } // namespace Calamares diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 4bae5cdf9..ca1e0bc92 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -15,11 +15,11 @@ #include "PythonHelper.h" #include "locale/Global.h" #include "partition/Mount.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/RAII.h" #include "utils/Runner.h" #include "utils/String.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 7b5f85376..26d746b96 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -384,10 +384,12 @@ settingsFileCandidates( bool assumeBuilddir ) settingsPaths << QDir::current().absoluteFilePath( settings ); } if ( Calamares::haveExtraDirs() ) + { for ( auto s : Calamares::extraConfigDirs() ) { settingsPaths << ( s + settings ); } + } settingsPaths << CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/settings.conf"; // String concat settingsPaths << Calamares::appDataDir().absoluteFilePath( settings ); } diff --git a/src/libcalamares/locale/TranslationsModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp index a222a02d4..81380bf45 100644 --- a/src/libcalamares/locale/TranslationsModel.cpp +++ b/src/libcalamares/locale/TranslationsModel.cpp @@ -78,10 +78,12 @@ TranslationsModel::locale( int row ) const if ( ( row < 0 ) || ( row >= m_locales.count() ) ) { for ( const auto& l : m_locales ) + { if ( l->isEnglish() ) { return *l; } + } return *m_locales[ 0 ]; } return *m_locales[ row ]; diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp index 0950f0f47..24ab553d8 100644 --- a/src/libcalamares/modulesystem/Module.cpp +++ b/src/libcalamares/modulesystem/Module.cpp @@ -74,10 +74,12 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c } if ( Calamares::haveExtraDirs() ) + { for ( auto s : Calamares::extraConfigDirs() ) { paths << ( s + QString( "modules/%1" ).arg( configFileName ) ); } + } paths << QString( "/etc/calamares/modules/%1" ).arg( configFileName ); paths << Calamares::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) ); diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp index 1cc30c9f9..03b776f4b 100644 --- a/src/libcalamares/partition/Mount.cpp +++ b/src/libcalamares/partition/Mount.cpp @@ -12,9 +12,9 @@ #include "Mount.h" #include "partition/Sync.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/String.h" +#include "utils/System.h" #include #include diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp index 9f49026e0..d1329a549 100644 --- a/src/libcalamares/partition/PartitionQuery.cpp +++ b/src/libcalamares/partition/PartitionQuery.cpp @@ -58,11 +58,15 @@ Partition* findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString& mountPoint ) { for ( auto device : devices ) + { for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + { if ( ( *it )->mountPoint() == mountPoint ) { return *it; } + } + } return nullptr; } diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp index 9f2a34220..3593f4498 100644 --- a/src/libcalamares/partition/Sync.cpp +++ b/src/libcalamares/partition/Sync.cpp @@ -10,8 +10,8 @@ #include "Sync.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" void Calamares::Partition::sync() diff --git a/src/libcalamares/python/Api.h b/src/libcalamares/python/Api.h index dd3bf339b..deb8c32c6 100644 --- a/src/libcalamares/python/Api.h +++ b/src/libcalamares/python/Api.h @@ -94,7 +94,7 @@ namespace Python __attribute__( ( visibility( "hidden" ) ) ) }; -} // namespace ) +} // namespace Python } // namespace Calamares #endif diff --git a/src/libcalamares/python/Pybind11Helpers.h b/src/libcalamares/python/Pybind11Helpers.h index cee7fb572..211e68386 100644 --- a/src/libcalamares/python/Pybind11Helpers.h +++ b/src/libcalamares/python/Pybind11Helpers.h @@ -33,6 +33,6 @@ namespace Python __attribute__( ( visibility( "hidden" ) ) ) return QString::fromUtf8( pybind11::str( o ).cast< std::string >().c_str() ); } -} // namespace ) +} // namespace Python } // namespace Calamares #endif diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp index 0125e8db2..96d5ea5d1 100644 --- a/src/libcalamares/utils/CommandList.cpp +++ b/src/libcalamares/utils/CommandList.cpp @@ -14,9 +14,9 @@ #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/StringExpander.h" +#include "utils/System.h" #include "utils/Variant.h" #include diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 15b6d65d0..d925cf64c 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -249,6 +249,7 @@ operator<<( QDebug& s, const RedactedCommand& l ) if ( l.list.contains( "usermod" ) ) { for ( const auto& item : l.list ) + { if ( item.startsWith( "$6$" ) ) { s << ""; @@ -257,6 +258,7 @@ operator<<( QDebug& s, const RedactedCommand& l ) { s << item; } + } } else { diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h index 1462cc0ff..d93287bc8 100644 --- a/src/libcalamares/utils/NamedEnum.h +++ b/src/libcalamares/utils/NamedEnum.h @@ -164,11 +164,13 @@ struct NamedEnumTable ok = false; for ( const auto& p : table ) + { if ( 0 == QString::compare( s, p.first, Qt::CaseInsensitive ) ) { ok = true; return p.second; } + } // ok is still false return table.begin()->second; @@ -207,11 +209,13 @@ struct NamedEnumTable ok = false; for ( const auto& p : table ) + { if ( s == p.second ) { ok = true; return p.first; } + } // ok is still false return string_t(); diff --git a/src/libcalamares/utils/NamedSuffix.h b/src/libcalamares/utils/NamedSuffix.h index 85ce11f2c..8454bbe1d 100644 --- a/src/libcalamares/utils/NamedSuffix.h +++ b/src/libcalamares/utils/NamedSuffix.h @@ -65,12 +65,14 @@ public: : NamedSuffix() { for ( const auto& suffix : table.table ) + { if ( s.endsWith( suffix.first ) ) { m_value = s.left( s.length() - suffix.first.length() ).toLongLong(); m_unit = suffix.second; break; } + } } /** @brief Construct value from string. diff --git a/src/libcalamares/utils/Permissions.cpp b/src/libcalamares/utils/Permissions.cpp index f6aad5e37..4aa3156aa 100644 --- a/src/libcalamares/utils/Permissions.cpp +++ b/src/libcalamares/utils/Permissions.cpp @@ -7,8 +7,8 @@ #include "Permissions.h" -#include "System.h" #include "Logger.h" +#include "System.h" #include #include diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h index 8e841f5e7..a5c0359ba 100644 --- a/src/libcalamares/utils/PluginFactory.h +++ b/src/libcalamares/utils/PluginFactory.h @@ -104,7 +104,9 @@ protected: { \ pluginRegistrations; \ } \ - name::~name() {} + name::~name() \ + { \ + } Q_DECLARE_INTERFACE( CalamaresPluginFactory, CalamaresPluginFactory_iid ) diff --git a/src/libcalamares/utils/System.cpp b/src/libcalamares/utils/System.cpp index 7e5e72dd7..5e17ffa66 100644 --- a/src/libcalamares/utils/System.cpp +++ b/src/libcalamares/utils/System.cpp @@ -262,6 +262,7 @@ System::getCpuDescription() const #ifdef Q_OS_LINUX QFile file( "/proc/cpuinfo" ); if ( file.open( QIODevice::ReadOnly | QIODevice::Text ) ) + { while ( !file.atEnd() ) { QByteArray line = file.readLine(); @@ -271,6 +272,7 @@ System::getCpuDescription() const break; } } + } #elif defined( Q_OS_FREEBSD ) // This would use sysctl "hw.model", which has a string value #endif @@ -303,29 +305,37 @@ ProcessResult::explainProcess( int ec, const QString& command, const QString& ou ? QCoreApplication::translate( "ProcessResult", "\nThere was no output from the command." ) : ( QCoreApplication::translate( "ProcessResult", "\nOutput:\n" ) + output ); - if ( ec == static_cast< int >( ProcessResult::Code::Crashed ) ) //Crash! + if ( ec == static_cast< int >( ProcessResult::Code::Crashed ) ) + { //Crash! return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command crashed." ), QCoreApplication::translate( "ProcessResult", "Command %1 crashed." ).arg( command ) + outputMessage ); + } if ( ec == static_cast< int >( ProcessResult::Code::FailedToStart ) ) + { return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command failed to start." ), QCoreApplication::translate( "ProcessResult", "Command %1 failed to start." ).arg( command ) ); + } if ( ec == static_cast< int >( ProcessResult::Code::NoWorkingDirectory ) ) + { return JobResult::error( QCoreApplication::translate( "ProcessResult", "Internal error when starting command." ), QCoreApplication::translate( "ProcessResult", "Bad parameters for process job call." ) ); + } if ( ec == static_cast< int >( ProcessResult::Code::TimedOut ) ) + { return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command failed to finish." ), QCoreApplication::translate( "ProcessResult", "Command %1 failed to finish in %2 seconds." ) .arg( command ) .arg( timeout.count() ) + outputMessage ); + } //Any other exit code return JobResult::error( diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp index db1808843..649c2ea60 100644 --- a/src/libcalamares/utils/TestPaths.cpp +++ b/src/libcalamares/utils/TestPaths.cpp @@ -9,9 +9,9 @@ * */ -#include "System.h" #include "Entropy.h" #include "Logger.h" +#include "System.h" #include "UMask.h" #include "Yaml.h" diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index fdf7a6f9d..ae0be4615 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -9,7 +9,6 @@ * */ -#include "System.h" #include "CommandList.h" #include "Entropy.h" #include "Logger.h" @@ -17,6 +16,7 @@ #include "Runner.h" #include "String.h" #include "StringExpander.h" +#include "System.h" #include "Traits.h" #include "UMask.h" #include "Variant.h" @@ -183,7 +183,9 @@ findConf( const QDir& d ) QString path = d.absolutePath(); path.append( d.separator() ); for ( const auto& confname : d.entryList( { "*.conf" } ) ) + { mine.append( path + confname ); + } for ( const auto& subdirname : d.entryList( QDir::AllDirs | QDir::NoDotAndDotDot ) ) { QDir subdir( d ); diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 30062fe5f..6842f4ed5 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -229,9 +229,11 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi m_componentName = QString::fromStdString( doc[ "componentName" ].as< std::string >() ); if ( m_componentName != componentDir.dirName() ) + { bail( m_descriptorPath, "The branding component name should match the name of the " "component directory." ); + } initSimpleSettings( doc ); initSlideshowSettings( doc ); @@ -630,9 +632,11 @@ Branding::initSlideshowSettings( const ::YAML::Node& doc ) QString slideshowPath = QString::fromStdString( slideshow.as< std::string >() ); QFileInfo slideshowFi( componentDir.absoluteFilePath( slideshowPath ) ); if ( !slideshowFi.exists() || !slideshowFi.fileName().toLower().endsWith( ".qml" ) ) + { bail( m_descriptorPath, QString( "Slideshow file %1 does not exist or is not a valid QML file." ) .arg( slideshowFi.absoluteFilePath() ) ); + } m_slideshowPath = slideshowFi.absoluteFilePath(); // API choice is relevant for QML slideshow diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 0e1a3b07e..6f678a2cd 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -420,11 +420,13 @@ ModuleManager::checkModuleDependencies( const Module& m ) { bool requirementFound = false; for ( const Module* v : m_loadedModulesByInstanceKey ) + { if ( required == v->name() ) { requirementFound = true; break; } + } if ( !requirementFound ) { cError() << "Module" << m.name() << "requires" << required << "before it in sequence."; diff --git a/src/libcalamaresui/utils/Qml.cpp b/src/libcalamaresui/utils/Qml.cpp index d731838a5..c06b06287 100644 --- a/src/libcalamaresui/utils/Qml.cpp +++ b/src/libcalamaresui/utils/Qml.cpp @@ -57,10 +57,12 @@ qmlDirCandidates( bool assumeBuilddir ) qmlDirs << QDir::current().absoluteFilePath( "src/qml" ); // In build-dir } if ( Calamares::haveExtraDirs() ) + { for ( auto s : Calamares::extraDataDirs() ) { qmlDirs << ( s + QML ); } + } qmlDirs << Calamares::appDataDir().absoluteFilePath( QML ); } diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h index 0c36243e6..fe678752a 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.h +++ b/src/libcalamaresui/viewpages/QmlViewStep.h @@ -114,7 +114,7 @@ private: #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) QWidget* m_qmlWidget = nullptr; // Qt6: container for QQuickWindow #else - QQuickWidget * m_qmlWidget = nullptr; + QQuickWidget* m_qmlWidget = nullptr; #endif QQmlEngine* m_qmlEngine = nullptr; // Qt5: points to QuickWidget engine, Qt6: separate engine diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp index d5a0fde49..3a5ca3185 100644 --- a/src/modules/contextualprocess/Tests.cpp +++ b/src/modules/contextualprocess/Tests.cpp @@ -14,9 +14,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/CommandList.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/modules/dummycpp/DummyCppJob.cpp b/src/modules/dummycpp/DummyCppJob.cpp index 483197682..d2c411766 100644 --- a/src/modules/dummycpp/DummyCppJob.cpp +++ b/src/modules/dummycpp/DummyCppJob.cpp @@ -19,8 +19,8 @@ #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" DummyCppJob::DummyCppJob( QObject* parent ) : Calamares::CppJob( parent ) diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index 98e1e8253..3b90c04b8 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -157,9 +157,11 @@ Calamares::JobResult ResizeFSJob::exec() { if ( !isValid() ) + { return Calamares::JobResult::error( tr( "Invalid configuration" ), tr( "The file-system resize job has an invalid configuration and will not run." ) ); + } if ( !m_kpmcore ) { @@ -172,11 +174,13 @@ ResizeFSJob::exec() // Now get the partition and FS we want to work on PartitionMatch m = findPartition(); if ( !m.first || !m.second ) + { return Calamares::JobResult::error( tr( "Resize Failed" ), !m_fsname.isEmpty() ? tr( "The filesystem %1 could not be found in this system, and cannot be resized." ).arg( m_fsname ) : tr( "The device %1 could not be found in this system, and cannot be resized." ).arg( m_devicename ) ); + } m.second->fileSystem().init(); // Initialize support for specific FS if ( !ResizeOperation::canGrow( m.second ) ) @@ -193,18 +197,22 @@ ResizeFSJob::exec() << ')' << "to -" << new_end; if ( new_end < 0 ) + { return Calamares::JobResult::error( tr( "Resize Failed" ), !m_fsname.isEmpty() ? tr( "The filesystem %1 cannot be resized." ).arg( m_fsname ) : tr( "The device %1 cannot be resized." ).arg( m_devicename ) ); + } if ( new_end == 0 ) { cWarning() << "Resize operation on" << m_fsname << m_devicename << "skipped as not-useful."; if ( m_required ) + { return Calamares::JobResult::error( tr( "Resize Failed" ), !m_fsname.isEmpty() ? tr( "The filesystem %1 must be resized, but cannot." ).arg( m_fsname ) : tr( "The device %1 must be resized, but cannot" ).arg( m_fsname ) ); + } return Calamares::JobResult::ok(); } diff --git a/src/modules/hostinfo/HostInfoJob.cpp b/src/modules/hostinfo/HostInfoJob.cpp index 7b11c2c7d..481fbe28a 100644 --- a/src/modules/hostinfo/HostInfoJob.cpp +++ b/src/modules/hostinfo/HostInfoJob.cpp @@ -11,8 +11,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Units.h" #include diff --git a/src/modules/initcpio/InitcpioJob.cpp b/src/modules/initcpio/InitcpioJob.cpp index 18c49ffd3..91520d9b3 100644 --- a/src/modules/initcpio/InitcpioJob.cpp +++ b/src/modules/initcpio/InitcpioJob.cpp @@ -10,8 +10,8 @@ #include "InitcpioJob.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/UMask.h" #include "utils/Variant.h" diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp index 5683775d7..56e6e0383 100644 --- a/src/modules/initramfs/InitramfsJob.cpp +++ b/src/modules/initramfs/InitramfsJob.cpp @@ -9,8 +9,8 @@ #include "InitramfsJob.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/UMask.h" #include "utils/Variant.h" diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp index 44cff8b29..3dd77881d 100644 --- a/src/modules/initramfs/Tests.cpp +++ b/src/modules/initramfs/Tests.cpp @@ -13,8 +13,8 @@ #include "JobQueue.h" #include "Settings.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp index 1337b7543..a30cb8dcb 100644 --- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp +++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp @@ -19,9 +19,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/String.h" +#include "utils/System.h" #include #include @@ -32,12 +32,12 @@ namespace { QStringList -removeEmpty(QStringList&& list) +removeEmpty( QStringList&& list ) { - list.removeAll(QString()); + list.removeAll( QString() ); return list; } -} +} // namespace SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model, const QString& layout, @@ -276,10 +276,10 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const " MatchIsKeyboard \"on\"\n"; - const QStringList layouts = removeEmpty({m_additionalLayoutInfo.additionalLayout, m_layout}); - const QStringList variants = removeEmpty({m_additionalLayoutInfo.additionalVariant, m_variant}); - stream << " Option \"XkbLayout\" \"" << layouts.join(",") << "\"\n"; - stream << " Option \"XkbVariant\" \"" << variants.join(",") << "\"\n"; + const QStringList layouts = removeEmpty( { m_additionalLayoutInfo.additionalLayout, m_layout } ); + const QStringList variants = removeEmpty( { m_additionalLayoutInfo.additionalVariant, m_variant } ); + stream << " Option \"XkbLayout\" \"" << layouts.join( "," ) << "\"\n"; + stream << " Option \"XkbVariant\" \"" << variants.join( "," ) << "\"\n"; if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() ) { stream << " Option \"XkbOptions\" \"" << m_additionalLayoutInfo.groupSwitcher << "\"\n"; @@ -290,8 +290,8 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const file.close(); - cDebug() << Logger::SubEntry << "Written XkbLayout" << layouts.join(",") << "; XkbModel" << m_model << "; XkbVariant" - << variants.join(",") << "to X.org file" << keyboardConfPath << stream.status(); + cDebug() << Logger::SubEntry << "Written XkbLayout" << layouts.join( "," ) << "; XkbModel" << m_model + << "; XkbVariant" << variants.join( "," ) << "to X.org file" << keyboardConfPath << stream.status(); return ( stream.status() == QTextStream::Ok ); } @@ -310,14 +310,14 @@ SetKeyboardLayoutJob::writeDefaultKeyboardData( const QString& defaultKeyboardPa } QTextStream stream( &file ); - const QStringList layouts = removeEmpty({m_additionalLayoutInfo.additionalLayout, m_layout}); - const QStringList variants = removeEmpty({m_additionalLayoutInfo.additionalVariant, m_variant}); + const QStringList layouts = removeEmpty( { m_additionalLayoutInfo.additionalLayout, m_layout } ); + const QStringList variants = removeEmpty( { m_additionalLayoutInfo.additionalVariant, m_variant } ); stream << "# KEYBOARD CONFIGURATION FILE\n\n" "# Consult the keyboard(5) manual page.\n\n"; stream << "XKBMODEL=\"" << m_model << "\"\n"; - stream << "XKBLAYOUT=\"" << layouts.join(",") << "\"\n"; - stream << "XKBVARIANT=\"" << variants.join(",") << "\"\n"; + stream << "XKBLAYOUT=\"" << layouts.join( "," ) << "\"\n"; + stream << "XKBVARIANT=\"" << variants.join( "," ) << "\"\n"; if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() ) { stream << "XKBOPTIONS=\"" << m_additionalLayoutInfo.groupSwitcher << "\"\n"; @@ -327,8 +327,9 @@ SetKeyboardLayoutJob::writeDefaultKeyboardData( const QString& defaultKeyboardPa file.close(); - cDebug() << Logger::SubEntry << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << layouts.join(",") << "; XKBVARIANT" - << variants.join(",") << "to /etc/default/keyboard file" << defaultKeyboardPath << stream.status(); + cDebug() << Logger::SubEntry << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << layouts.join( "," ) + << "; XKBVARIANT" << variants.join( "," ) << "to /etc/default/keyboard file" << defaultKeyboardPath + << stream.status(); return ( stream.status() == QTextStream::Ok ); } diff --git a/src/modules/locale/Config.h b/src/modules/locale/Config.h index 19f3467a1..a0184e6d5 100644 --- a/src/modules/locale/Config.h +++ b/src/modules/locale/Config.h @@ -30,8 +30,7 @@ class Config : public QObject Q_PROPERTY( Calamares::Locale::ZonesModel* zonesModel READ zonesModel CONSTANT FINAL ) Q_PROPERTY( QAbstractItemModel* regionalZonesModel READ regionalZonesModel CONSTANT FINAL ) - Q_PROPERTY( - Calamares::Locale::TimeZoneData* currentLocation READ currentLocation_c NOTIFY currentLocationChanged ) + Q_PROPERTY( Calamares::Locale::TimeZoneData* currentLocation READ currentLocation_c NOTIFY currentLocationChanged ) // Status are complete, human-readable, messages Q_PROPERTY( QString currentLocationStatus READ currentLocationStatus NOTIFY currentLanguageStatusChanged ) diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp index e91307e3a..b5fcb1bef 100644 --- a/src/modules/locale/SetTimezoneJob.cpp +++ b/src/modules/locale/SetTimezoneJob.cpp @@ -13,8 +13,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "Settings.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include @@ -56,23 +56,29 @@ SetTimezoneJob::exec() Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); QFileInfo zoneFile( gs->value( "rootMountPoint" ).toString() + zoneinfoPath ); if ( !zoneFile.exists() || !zoneFile.isReadable() ) + { return Calamares::JobResult::error( tr( "Cannot access selected timezone path." ), tr( "Bad path: %1" ).arg( zoneFile.absolutePath() ) ); + } // Make sure /etc/localtime doesn't exist, otherwise symlinking will fail Calamares::System::instance()->targetEnvCall( { "rm", "-f", localtimeSlink } ); int ec = Calamares::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } ); if ( ec ) + { return Calamares::JobResult::error( tr( "Cannot set timezone." ), tr( "Link creation failed, target: %1; link name: %2" ).arg( zoneinfoPath ).arg( "/etc/localtime" ) ); + } QFile timezoneFile( gs->value( "rootMountPoint" ).toString() + "/etc/timezone" ); if ( !timezoneFile.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) + { return Calamares::JobResult::error( tr( "Cannot set timezone," ), tr( "Cannot open /etc/timezone for writing" ) ); + } QTextStream out( &timezoneFile ); out << m_region << '/' << m_zone << "\n"; diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 125ca1d30..896ca4ac4 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -310,7 +310,8 @@ LocaleTests::testLanguageDetection_data() << QStringLiteral( "en_US.UTF-8" ); QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" ) << QStringLiteral( "en_GB.UTF-8" ); - QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en_US.UTF-8" ); + QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) + << QStringLiteral( "en_US.UTF-8" ); QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" ) << QStringLiteral( "pt_PT.UTF-8" ); diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp index 6c68b4b53..620957d27 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp @@ -7,10 +7,10 @@ #include "LuksBootKeyFileJob.h" -#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" +#include "utils/System.h" #include "utils/UMask.h" #include "utils/Variant.h" diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index 86103ecc6..5913262e4 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -10,11 +10,11 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" #include "utils/PluginFactory.h" #include "utils/String.h" +#include "utils/System.h" #include "utils/Variant.h" #include diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp index fe5d58583..094b113ed 100644 --- a/src/modules/luksopenswaphookcfg/Tests.cpp +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -10,8 +10,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp index a86105d9a..41a216dd6 100644 --- a/src/modules/machineid/MachineIdJob.cpp +++ b/src/modules/machineid/MachineIdJob.cpp @@ -13,8 +13,8 @@ #include "MachineIdJob.h" #include "Workers.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include "GlobalStorage.h" diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp index d30dd8c10..769751c75 100644 --- a/src/modules/machineid/Tests.cpp +++ b/src/modules/machineid/Tests.cpp @@ -12,8 +12,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp index 44a488e0a..6fe631f2e 100644 --- a/src/modules/machineid/Workers.cpp +++ b/src/modules/machineid/Workers.cpp @@ -12,9 +12,9 @@ #include "Workers.h" -#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" +#include "utils/System.h" #include diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp index ddb08c5c7..76f97fa1c 100644 --- a/src/modules/netinstall/PackageTreeItem.cpp +++ b/src/modules/netinstall/PackageTreeItem.cpp @@ -241,12 +241,14 @@ void PackageTreeItem::setChildrenSelected( Qt::CheckState isSelected ) { if ( isSelected != Qt::PartiallyChecked ) + { // Children are never root; don't need to use setSelected on them. for ( auto child : m_childItems ) { child->m_selected = isSelected; child->setChildrenSelected( isSelected ); } + } } void diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h index 71ea31326..02a033225 100644 --- a/src/modules/notesqml/NotesQmlViewStep.h +++ b/src/modules/notesqml/NotesQmlViewStep.h @@ -11,8 +11,8 @@ #include "DllMacro.h" #include "locale/TranslatableConfiguration.h" -#include "utils/System.h" #include "utils/PluginFactory.h" +#include "utils/System.h" #include "utils/Variant.h" #include "viewpages/QmlViewStep.h" diff --git a/src/modules/oemid/IDJob.cpp b/src/modules/oemid/IDJob.cpp index ccda86057..e673f7c01 100644 --- a/src/modules/oemid/IDJob.cpp +++ b/src/modules/oemid/IDJob.cpp @@ -77,10 +77,12 @@ IDJob::exec() // Don't bother translating internal errors if ( rootMount.isEmpty() && Calamares::Settings::instance()->doChroot() ) + { return Calamares::JobResult::internalError( "OEM Batch Identifier", "No rootMountPoint is set, but a chroot is required. " "Is there a module before oemid that sets up the partitions?", Calamares::JobResult::InvalidConfiguration ); + } return writeId( Calamares::Settings::instance()->doChroot() ? rootMount + targetDir : targetDir, targetFile, m_batchIdentifier ); diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index 89b226879..a6be74511 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -16,8 +16,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp index 15b0d87a2..e780b5e3d 100644 --- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp @@ -13,8 +13,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserQmlViewStepFactory, registerPlugin< PackageChooserQmlViewStep >(); ) diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp index 912d4f822..6dc17be11 100644 --- a/src/modules/partition/core/ColorUtils.cpp +++ b/src/modules/partition/core/ColorUtils.cpp @@ -156,8 +156,10 @@ colorForPartition( Partition* partition ) } } else + { s_partitionColorsCache.insert( partition->fileSystem().uuid(), PARTITION_COLORS[ colorIdx % NUM_PARTITION_COLORS ] ); + } } return PARTITION_COLORS[ colorIdx % NUM_PARTITION_COLORS ]; } diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 531db660f..16723c750 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -11,8 +11,8 @@ #include "DeviceList.h" #include "partition/PartitionIterator.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include @@ -34,10 +34,12 @@ static bool hasRootPartition( Device* device ) { for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + { if ( ( *it )->mountPoint() == "/" ) { return true; } + } return false; } diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index 289520ec5..3ceafb003 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -128,8 +128,7 @@ int cryptVersion( Partition* partition ); * * @return The LUKS FS type (default @c luks ) */ -FileSystem::Type -luksGenerationToFSName( Config::LuksGeneration luksGeneration ); +FileSystem::Type luksGenerationToFSName( Config::LuksGeneration luksGeneration ); /** @brief Return a result for an @p operation diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 5cbe392e8..8c646e312 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -20,9 +20,9 @@ #include "partition/Mount.h" #include "partition/PartitionIterator.h" #include "partition/PartitionQuery.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/RAII.h" +#include "utils/System.h" #include #include @@ -595,11 +595,15 @@ FstabEntry::fromEtcFstab( const QString& rawLine ) { QString line = rawLine.simplified(); if ( line.startsWith( '#' ) ) + { return FstabEntry { QString(), QString(), QString(), QString(), 0, 0 }; + } QStringList splitLine = line.split( ' ' ); if ( splitLine.length() != 6 ) + { return FstabEntry { QString(), QString(), QString(), QString(), 0, 0 }; + } return FstabEntry { splitLine.at( 0 ), // path, or UUID, or LABEL, etc. diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 3e4558691..25e4a01a5 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -18,9 +18,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" +#include "utils/System.h" #include "utils/Units.h" #include diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 69b2355dc..dafa6a9a0 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -315,6 +315,7 @@ PartitionCoreModule::doInit() DeviceList bootLoaderDevices; for ( DeviceList::Iterator it = devices.begin(); it != devices.end(); ++it ) + { if ( ( *it )->type() != Device::Type::Disk_Device ) { cDebug() << "Ignoring device that is not Disk_Device to bootLoaderDevices list."; @@ -324,6 +325,7 @@ PartitionCoreModule::doInit() { bootLoaderDevices.append( *it ); } + } m_bootLoaderModel->init( bootLoaderDevices ); @@ -482,10 +484,12 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) // deleting them, so let's play it safe and keep our own list. QList< Partition* > lst; for ( auto childPartition : partition->children() ) + { if ( !isPartitionFreeSpace( childPartition ) ) { lst << childPartition; } + } for ( auto childPartition : lst ) { @@ -781,11 +785,13 @@ PartitionCoreModule::updateIsDirty() bool oldValue = m_isDirty; m_isDirty = false; for ( auto info : m_deviceInfos ) + { if ( info->isDirty() ) { m_isDirty = true; break; } + } if ( oldValue != m_isDirty ) { isDirtyChanged( m_isDirty ); @@ -806,8 +812,7 @@ PartitionCoreModule::scanForEfiSystemPartitions() devices.append( device ); } - QList< Partition* > efiSystemPartitions - = Calamares::Partition::findPartitions( devices, PartUtils::isEfiBootable ); + QList< Partition* > efiSystemPartitions = Calamares::Partition::findPartitions( devices, PartUtils::isEfiBootable ); if ( efiSystemPartitions.isEmpty() ) { @@ -853,12 +858,14 @@ PartitionCoreModule::scanForLVMPVs() m_lvmPVs << p.partition().data(); for ( LvmDevice* device : vgDevices ) + { if ( p.vgName() == device->name() ) { // Adding scanned VG to PV list device->physicalVolumes() << p.partition(); break; } + } } for ( DeviceInfo* d : m_deviceInfos ) @@ -924,10 +931,12 @@ PartitionCoreModule::findPartitionByMountPoint( const QString& mountPoint ) cons { Device* device = deviceInfo->device.data(); for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + { if ( PartitionInfo::mountPoint( *it ) == mountPoint ) { return *it; } + } } return nullptr; } @@ -1144,10 +1153,12 @@ bool PartitionCoreModule::isVGdeactivated( LvmDevice* device ) { for ( DeviceInfo* deviceInfo : m_deviceInfos ) + { if ( device == deviceInfo->device.data() && !deviceInfo->isAvailable ) { return true; } + } return false; } diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index f425f9e4e..a0594a4c3 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -205,8 +205,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const name = isPartitionNew( partition ) ? tr( "New partition" ) : partition->partitionPath(); } } - QString prettyFileSystem - = Calamares::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); + QString prettyFileSystem = Calamares::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); QString prettySize = formatByteSize( size ); return QVariant( name + " " + prettyFileSystem + " " + prettySize ); @@ -239,43 +238,53 @@ PartitionModel::data( const QModelIndex& index, int role ) const // Osprober roles: case OsproberNameRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) + { if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) { return osproberEntry.prettyName; } + } return QVariant(); case OsproberPathRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) + { if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) { return osproberEntry.path; } + } return QVariant(); case OsproberCanBeResizedRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) + { if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) { return osproberEntry.canBeResized; } + } return QVariant(); case OsproberRawLineRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) + { if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) { return osproberEntry.line; } + } return QVariant(); case OsproberHomePartitionPathRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) + { if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) { return osproberEntry.homePath; } + } return QVariant(); // end Osprober roles. diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 313eda2ed..8e7f36258 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -206,10 +206,12 @@ createCombo( const QSet< SwapChoice >& s, SwapChoice dflt ) SwapChoice::FullSwap, SwapChoice::ReuseSwap, SwapChoice::SwapFile } ) + { if ( s.contains( c ) ) { box->addItem( QString(), c ); } + } int dfltIndex = box->findData( dflt ); if ( dfltIndex >= 0 ) @@ -851,10 +853,12 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) // m_reuseHomeCheckBox visible and set its text to something meaningful. homePartitionPath->clear(); for ( const OsproberEntry& osproberEntry : m_core->osproberEntries() ) + { if ( osproberEntry.path == partPath ) { *homePartitionPath = osproberEntry.homePath; } + } if ( homePartitionPath->isEmpty() ) { doReuseHomePartition = false; @@ -888,17 +892,23 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) { m_reuseHomeCheckBox->setVisible( !homePartitionPath->isEmpty() ); if ( !homePartitionPath->isEmpty() ) + { m_reuseHomeCheckBox->setText( tr( "Reuse %1 as home partition for %2." ) .arg( *homePartitionPath ) .arg( Calamares::Branding::instance()->shortProductName() ) ); + } delete homePartitionPath; if ( m_isEfi ) + { setupEfiSystemPartitionSelector(); + } updateNextEnabled(); if ( !m_bootloaderComboBox.isNull() && m_bootloaderComboBox->currentIndex() < 0 ) + { m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + } }, this ); } diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 942d4f913..d33949397 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -250,16 +250,17 @@ CreatePartitionDialog::getNewlyCreatedPartition() if ( m_ui->encryptWidget->state() == EncryptWidget::Encryption::Confirmed && !luksPassphrase.isEmpty() && fsType != FileSystem::Zfs ) { - partition = KPMHelpers::createNewEncryptedPartition( m_parent, - *m_device, - m_role, - fsType, - fsLabel, - first, - last, - Config::luksGenerationNames().find(luksFsType, Config::LuksGeneration::Luks1), - luksPassphrase, - PartitionTable::Flags() ); + partition = KPMHelpers::createNewEncryptedPartition( + m_parent, + *m_device, + m_role, + fsType, + fsLabel, + first, + last, + Config::luksGenerationNames().find( luksFsType, Config::LuksGeneration::Luks1 ), + luksPassphrase, + PartitionTable::Flags() ); } else { diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index 4dfaae140..a9c940d37 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -223,10 +223,12 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const secondLine = index.sibling( index.row(), PartitionModel::SizeColumn ).data().toString(); } else + { //: size[number] filesystem[name] secondLine = tr( "%1 %2" ) .arg( index.sibling( index.row(), PartitionModel::SizeColumn ).data().toString() ) .arg( index.sibling( index.row(), PartitionModel::FileSystemColumn ).data().toString() ); + } return { firstLine, secondLine }; } diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 3daa4176a..bc845c535 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -284,10 +284,12 @@ PartitionPage::onNewVolumeGroupClicked() QVector< const Partition* > availablePVs; for ( const Partition* p : m_core->lvmPVs() ) + { if ( !m_core->isInVG( p ) ) { availablePVs << p; } + } QPointer< CreateVolumeGroupDialog > dlg = new CreateVolumeGroupDialog( vgName, selectedPVs, availablePVs, peSize, this ); @@ -342,10 +344,12 @@ PartitionPage::onResizeVolumeGroupClicked() QVector< const Partition* > selectedPVs; for ( const Partition* p : m_core->lvmPVs() ) + { if ( !m_core->isInVG( p ) ) { availablePVs << p; } + } QPointer< ResizeVolumeGroupDialog > dlg = new ResizeVolumeGroupDialog( device, availablePVs, selectedPVs, this ); diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index c985c9a25..1a5f4b5ae 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -16,8 +16,8 @@ #include "partition/FileSystem.h" #include "partition/PartitionQuery.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Units.h" #include diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 77b164d88..481db4e2a 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -12,8 +12,8 @@ #include "CreatePartitionTableJob.h" #include "partition/PartitionIterator.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "core/KPMHelpers.h" diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 985e84ecc..5f92b5041 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -11,9 +11,9 @@ #include "FillGlobalStorageJob.h" +#include "compat/Variant.h" #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" -#include "compat/Variant.h" #include "Branding.h" #include "GlobalStorage.h" diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 8b4cfaf92..434b39016 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -14,8 +14,8 @@ #include "core/KPMHelpers.h" #include "partition/FileSystem.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index 82c93a854..24686b57b 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -104,10 +104,12 @@ static ::Partition* firstFreePartition( PartitionNode* parent ) { for ( auto child : parent->children() ) + { if ( Calamares::Partition::isPartitionFreeSpace( child ) ) { return child; } + } return nullptr; } diff --git a/src/modules/plasmalnf/Config.cpp b/src/modules/plasmalnf/Config.cpp index f2f13356c..f64ffcb49 100644 --- a/src/modules/plasmalnf/Config.cpp +++ b/src/modules/plasmalnf/Config.cpp @@ -12,8 +12,8 @@ #include "PlasmaLnfJob.h" #include "ThemeInfo.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #ifdef WITH_KCONFIG @@ -76,6 +76,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // about the themes from Plasma (e.g. human-readable name and description) // are filled in by update_names() in PlasmaLnfPage. for ( const auto& i : themeList ) + { if ( i.type() == QVariant::Map ) { auto iv = i.toMap(); @@ -85,6 +86,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) { listedThemes.insert( i.toString(), QString() ); } + } if ( listedThemes.count() == 1 ) { diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp index b11acdf52..44f3b59e7 100644 --- a/src/modules/plasmalnf/PlasmaLnfJob.cpp +++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp @@ -11,8 +11,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #ifdef WITH_KCONFIG #include diff --git a/src/modules/plasmalnf/PlasmaLnfPage.cpp b/src/modules/plasmalnf/PlasmaLnfPage.cpp index 7a5f2bab4..3665058d4 100644 --- a/src/modules/plasmalnf/PlasmaLnfPage.cpp +++ b/src/modules/plasmalnf/PlasmaLnfPage.cpp @@ -76,15 +76,19 @@ PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent ) CALAMARES_RETRANSLATE( { ui->retranslateUi( this ); if ( Calamares::Settings::instance()->isSetupMode() ) + { ui->generalExplanation->setText( tr( "Please choose a look-and-feel for the KDE Plasma Desktop. " "You can also skip this step and configure the look-and-feel " "once the system is set up. Clicking on a look-and-feel " "selection will give you a live preview of that look-and-feel." ) ); + } else + { ui->generalExplanation->setText( tr( "Please choose a look-and-feel for the KDE Plasma Desktop. " "You can also skip this step and configure the look-and-feel " "once the system is installed. Clicking on a look-and-feel " "selection will give you a live preview of that look-and-feel." ) ); + } } ); auto* view = new QListView( this ); diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp index 960669ade..7e8c28e22 100644 --- a/src/modules/preservefiles/Item.cpp +++ b/src/modules/preservefiles/Item.cpp @@ -10,8 +10,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Units.h" #include "utils/Variant.h" diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index b65a273b7..f902a0967 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -13,10 +13,10 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/System.h" #include "utils/CommandList.h" #include "utils/Logger.h" #include "utils/StringExpander.h" +#include "utils/System.h" #include "utils/Units.h" #include diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp index 81cd81d9c..645843b87 100644 --- a/src/modules/preservefiles/Tests.cpp +++ b/src/modules/preservefiles/Tests.cpp @@ -10,9 +10,9 @@ #include "Item.h" #include "Settings.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/modules/removeuser/RemoveUserJob.cpp b/src/modules/removeuser/RemoveUserJob.cpp index 8f5dfcda4..4c8b83f63 100644 --- a/src/modules/removeuser/RemoveUserJob.cpp +++ b/src/modules/removeuser/RemoveUserJob.cpp @@ -13,8 +13,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp index 82e54d381..5bd19de8d 100644 --- a/src/modules/tracking/TrackingJobs.cpp +++ b/src/modules/tracking/TrackingJobs.cpp @@ -14,8 +14,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "network/Manager.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp index 8498d6de8..dd18ee87e 100644 --- a/src/modules/tracking/TrackingViewStep.cpp +++ b/src/modules/tracking/TrackingViewStep.cpp @@ -16,8 +16,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include diff --git a/src/modules/umount/Tests.cpp b/src/modules/umount/Tests.cpp index fc1d3d666..a0ae8bc34 100644 --- a/src/modules/umount/Tests.cpp +++ b/src/modules/umount/Tests.cpp @@ -11,8 +11,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp index c40353809..93c0ceb80 100644 --- a/src/modules/umount/UmountJob.cpp +++ b/src/modules/umount/UmountJob.cpp @@ -15,8 +15,8 @@ #include "UmountJob.h" #include "partition/Mount.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include "GlobalStorage.h" diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp index 50e4e92e0..4d20bc4a4 100644 --- a/src/modules/users/CreateUserJob.cpp +++ b/src/modules/users/CreateUserJob.cpp @@ -11,9 +11,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" +#include "utils/System.h" #include #include diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp index 9a3fedeec..851f6a9d4 100644 --- a/src/modules/users/MiscJobs.cpp +++ b/src/modules/users/MiscJobs.cpp @@ -14,9 +14,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" +#include "utils/System.h" #include #include diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp index 1f7a15b64..42da6c58d 100644 --- a/src/modules/users/SetHostNameJob.cpp +++ b/src/modules/users/SetHostNameJob.cpp @@ -13,8 +13,8 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include #include diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp index 630cf1168..c296c2a5e 100644 --- a/src/modules/users/SetPasswordJob.cpp +++ b/src/modules/users/SetPasswordJob.cpp @@ -12,9 +12,9 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" +#include "utils/System.h" #include @@ -74,15 +74,19 @@ SetPasswordJob::exec() Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); QDir destDir( gs->value( "rootMountPoint" ).toString() ); if ( !destDir.exists() ) + { return Calamares::JobResult::error( tr( "Bad destination system path." ), tr( "rootMountPoint is %1" ).arg( destDir.absolutePath() ) ); + } if ( m_userName == "root" && m_newPassword.isEmpty() ) //special case for disabling root account { int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", "!", m_userName } ); if ( ec ) + { return Calamares::JobResult::error( tr( "Cannot disable root account." ), tr( "usermod terminated with error code %1." ).arg( ec ) ); + } return Calamares::JobResult::ok(); } @@ -90,8 +94,10 @@ SetPasswordJob::exec() int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", encrypted, m_userName } ); if ( ec ) + { return Calamares::JobResult::error( tr( "Cannot set password for user %1." ).arg( m_userName ), tr( "usermod terminated with error code %1." ).arg( ec ) ); + } return Calamares::JobResult::ok(); } diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp index f3974973b..90e44de5f 100644 --- a/src/modules/users/TestSetHostNameJob.cpp +++ b/src/modules/users/TestSetHostNameJob.cpp @@ -16,8 +16,8 @@ extern bool setSystemdHostname( const QString& ); #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp index 0b7d005a6..c68178b37 100644 --- a/src/modules/welcome/Tests.cpp +++ b/src/modules/welcome/Tests.cpp @@ -12,8 +12,8 @@ #include "Branding.h" #include "Settings.h" #include "network/Manager.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Yaml.h" #include diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 4f105ab11..eeb932836 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -29,7 +29,7 @@ namespace GeoIP { class Handler; } // namespace GeoIP -} // namespace CalamaresUtils +} // namespace Calamares class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep { diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index 8805f7c86..df594f1e0 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -23,9 +23,9 @@ #include "modulesystem/Requirement.h" #include "network/Manager.h" #include "utils/Gui.h" -#include "utils/System.h" #include "utils/Logger.h" #include "utils/Retranslator.h" +#include "utils/System.h" #include "utils/Units.h" #include "utils/Variant.h" #include "widgets/WaitingWidget.h" @@ -367,10 +367,12 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap ) // Help out with consistency, but don't fix for ( const auto& r : m_entriesToRequire ) + { if ( !m_entriesToCheck.contains( r ) ) { cWarning() << "GeneralRequirements requires" << r << "but does not check it."; } + } if ( configurationMap.contains( "requiredStorage" ) && ( Calamares::typeOf( configurationMap.value( "requiredStorage" ) ) == Calamares::DoubleVariantType diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.h b/src/modules/welcomeq/WelcomeQmlViewStep.h index dd63817b6..1839c7c9b 100644 --- a/src/modules/welcomeq/WelcomeQmlViewStep.h +++ b/src/modules/welcomeq/WelcomeQmlViewStep.h @@ -27,7 +27,7 @@ namespace GeoIP { class Handler; } // namespace GeoIP -} // namespace CalamaresUtils +} // namespace Calamares // TODO: refactor and move what makes sense to base class diff --git a/src/modules/zfs/ZfsJob.cpp b/src/modules/zfs/ZfsJob.cpp index ccfa94f56..c98de5e65 100644 --- a/src/modules/zfs/ZfsJob.cpp +++ b/src/modules/zfs/ZfsJob.cpp @@ -9,8 +9,8 @@ #include "ZfsJob.h" -#include "utils/System.h" #include "utils/Logger.h" +#include "utils/System.h" #include "utils/Variant.h" #include "GlobalStorage.h"