[calamares] Reformat the rest of the application

src/calamares/CalamaresApplication.cpp

@@ -19,22 +19,22 @@
 #include "CalamaresApplication.h"
 
 #include "CalamaresConfig.h"
-#include "CalamaresWindow.h"
 #include "CalamaresVersion.h"
-#include "progresstree/ProgressTreeView.h"
+#include "CalamaresWindow.h"
 #include "progresstree/ProgressTreeModel.h"
+#include "progresstree/ProgressTreeView.h"
 
+#include "Branding.h"
+#include "JobQueue.h"
+#include "Settings.h"
+#include "ViewManager.h"
 #include "modulesystem/ModuleManager.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
-#include "JobQueue.h"
-#include "Branding.h"
-#include "Settings.h"
 #include "viewpages/ViewStep.h"
-#include "ViewManager.h"
 
 #include <QDesktopWidget>
 #include <QDir>
@@ -77,8 +77,7 @@ CalamaresApplication::init()
     initSettings();
     initBranding();
 
-    setWindowIcon( QIcon( Calamares::Branding::instance()->
+    setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) );
-                          imagePath( Calamares::Branding::ProductIcon ) ) );
 
     cDebug() << "STARTUP: initQmlPath, initSettings, initBranding done";
 
@@ -130,14 +129,20 @@ qmlDirCandidates( bool assumeBuilddir )
 
     QStringList qmlDirs;
     if ( CalamaresUtils::isAppDataDirOverridden() )
+    {
         qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
+    }
     else
     {
         if ( assumeBuilddir )
+        {
             qmlDirs << QDir::current().absoluteFilePath( "src/qml" );  // In build-dir
+        }
         if ( CalamaresUtils::haveExtraDirs() )
             for ( auto s : CalamaresUtils::extraDataDirs() )
+            {
                 qmlDirs << ( s + QML );
+            }
         qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
     }
 
@@ -152,14 +157,20 @@ settingsFileCandidates( bool assumeBuilddir )
 
     QStringList settingsPaths;
     if ( CalamaresUtils::isAppDataDirOverridden() )
+    {
         settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings );
+    }
     else
     {
         if ( assumeBuilddir )
+        {
             settingsPaths << QDir::current().absoluteFilePath( settings );
+        }
         if ( CalamaresUtils::haveExtraDirs() )
             for ( auto s : CalamaresUtils::extraConfigDirs() )
+            {
                 settingsPaths << ( s + settings );
+            }
         settingsPaths << CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/settings.conf";  // String concat
         settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings );
     }
@@ -173,14 +184,20 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename )
 {
     QStringList brandingPaths;
     if ( CalamaresUtils::isAppDataDirOverridden() )
+    {
         brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename );
+    }
     else
     {
         if ( assumeBuilddir )
+        {
             brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename );
+        }
         if ( CalamaresUtils::haveExtraDirs() )
             for ( auto s : CalamaresUtils::extraDataDirs() )
+            {
                 brandingPaths << ( s + brandingFilename );
+            }
         brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename );
         brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename );
     }
@@ -212,9 +229,13 @@ CalamaresApplication::initQmlPath()
         cError() << "Cowardly refusing to continue startup without a QML directory."
                  << Logger::DebugList( qmlDirCandidatesByPriority );
         if ( CalamaresUtils::isAppDataDirOverridden() )
+        {
             cError() << "FATAL: explicitly configured application data directory is missing qml/";
+        }
         else
+        {
             cError() << "FATAL: none of the expected QML paths exist.";
+        }
         ::exit( EXIT_FAILURE );
     }
 
@@ -247,9 +268,13 @@ CalamaresApplication::initSettings()
         cError() << "Cowardly refusing to continue startup without settings."
                  << Logger::DebugList( settingsFileCandidatesByPriority );
         if ( CalamaresUtils::isAppDataDirOverridden() )
+        {
             cError() << "FATAL: explicitly configured application data directory is missing settings.conf";
+        }
         else
+        {
             cError() << "FATAL: none of the expected configuration file paths exist.";
+        }
         ::exit( EXIT_FAILURE );
     }
 
@@ -294,9 +319,13 @@ CalamaresApplication::initBranding()
         cError() << "Cowardly refusing to continue startup without branding."
                  << Logger::DebugList( brandingFileCandidatesByPriority );
         if ( CalamaresUtils::isAppDataDirOverridden() )
+        {
             cError() << "FATAL: explicitly configured application data directory is missing" << brandingComponentName;
+        }
         else
+        {
             cError() << "FATAL: none of the expected branding descriptor file paths exist.";
+        }
         ::exit( EXIT_FAILURE );
     }
 
@@ -307,10 +336,8 @@ CalamaresApplication::initBranding()
 void
 CalamaresApplication::initModuleManager()
 {
-    m_moduleManager = new Calamares::ModuleManager(
+    m_moduleManager = new Calamares::ModuleManager( Calamares::Settings::instance()->modulesSearchPaths(), this );
-        Calamares::Settings::instance()->modulesSearchPaths(), this );
+    connect( m_moduleManager, &Calamares::ModuleManager::initDone, this, &CalamaresApplication::initView );
-    connect( m_moduleManager, &Calamares::ModuleManager::initDone,
-             this,            &CalamaresApplication::initView );
     m_moduleManager->init();
 }
 
@@ -324,16 +351,12 @@ CalamaresApplication::initView()
 
     m_mainwindow = new CalamaresWindow();  //also creates ViewManager
 
-    connect( m_moduleManager, &Calamares::ModuleManager::modulesLoaded,
+    connect( m_moduleManager, &Calamares::ModuleManager::modulesLoaded, this, &CalamaresApplication::initViewSteps );
-             this, &CalamaresApplication::initViewSteps );
+    connect( m_moduleManager, &Calamares::ModuleManager::modulesFailed, this, &CalamaresApplication::initFailed );
-    connect( m_moduleManager, &Calamares::ModuleManager::modulesFailed,
-             this, &CalamaresApplication::initFailed );
 
     m_moduleManager->loadModules();
 
-    m_mainwindow->move(
+    m_mainwindow->move( this->desktop()->availableGeometry().center() - m_mainwindow->rect().center() );
-        this->desktop()->availableGeometry().center() -
-        m_mainwindow->rect().center() );
 
     cDebug() << "STARTUP: CalamaresWindow created; loadModules started";
 }
@@ -350,7 +373,9 @@ CalamaresApplication::initViewSteps()
         m_mainwindow->showMaximized();
     }
     else
+    {
         m_mainwindow->show();
+    }
 
     ProgressTreeModel* m = new ProgressTreeModel( nullptr );
     ProgressTreeView::instance()->setModel( m );
@@ -360,8 +385,10 @@ CalamaresApplication::initViewSteps()
     cDebug() << Logger::SubEntry << steps.count() << "view steps loaded.";
     // Tell the first view that it's been shown.
     if ( steps.count() > 0 )
+    {
         steps[ 0 ]->onActivate();
     }
+}
 
 void
 CalamaresApplication::initFailed( const QStringList& l )

src/calamares/CalamaresWindow.cpp

@@ -21,33 +21,39 @@
 
 #include "CalamaresWindow.h"
 
+#include "Branding.h"
+#include "Settings.h"
 #include "ViewManager.h"
 #include "progresstree/ProgressTreeView.h"
 #include "utils/CalamaresUtilsGui.h"
-#include "utils/Logger.h"
 #include "utils/DebugWindow.h"
+#include "utils/Logger.h"
 #include "utils/Retranslator.h"
-#include "Settings.h"
-#include "Branding.h"
 
 #include <QApplication>
 #include <QBoxLayout>
 #include <QCloseEvent>
 #include <QDesktopWidget>
-#include <QLabel>
-#include <QTreeView>
 #include <QFile>
 #include <QFileInfo>
+#include <QLabel>
+#include <QTreeView>
 
 static inline int
 windowDimensionToPixels( const Calamares::Branding::WindowDimension& u )
 {
     if ( !u.isValid() )
+    {
         return 0;
+    }
     if ( u.unit() == Calamares::Branding::WindowDimensionUnit::Pixies )
+    {
         return u.value();
+    }
     if ( u.unit() == Calamares::Branding::WindowDimensionUnit::Fonties )
+    {
         return u.value() * CalamaresUtils::defaultFontHeight();
+    }
     return 0;
 }
 
@@ -58,14 +64,13 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
 {
     // If we can never cancel, don't show the window-close button
     if ( Calamares::Settings::instance()->disableCancel() )
+    {
         setWindowFlag( Qt::WindowCloseButtonHint, false );
+    }
 
-    CALAMARES_RETRANSLATE(
+    CALAMARES_RETRANSLATE( setWindowTitle( Calamares::Settings::instance()->isSetupMode()
-        setWindowTitle( Calamares::Settings::instance()->isSetupMode()
                                                ? tr( "%1 Setup Program" ).arg( *Calamares::Branding::ProductName )
-                            : tr( "%1 Installer" ).arg( *Calamares::Branding::ProductName )
+                                               : tr( "%1 Installer" ).arg( *Calamares::Branding::ProductName ) ); )
-                         );
-    )
 
     const Calamares::Branding* const branding = Calamares::Branding::instance();
 
@@ -102,7 +107,8 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     QBoxLayout* sideLayout = new QVBoxLayout;
     sideBox->setLayout( sideLayout );
     // Set this attribute into qss file
-    sideBox->setFixedWidth( qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
+    sideBox->setFixedWidth(
+        qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
     sideBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
     QHBoxLayout* logoLayout = new QHBoxLayout;
@@ -133,22 +139,16 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     {
         QPushButton* debugWindowBtn = new QPushButton;
         debugWindowBtn->setObjectName( "debugButton" );
-        CALAMARES_RETRANSLATE(
+        CALAMARES_RETRANSLATE( debugWindowBtn->setText( tr( "Show debug information" ) ); )
-            debugWindowBtn->setText( tr( "Show debug information" ) );
-        )
         sideLayout->addWidget( debugWindowBtn );
         debugWindowBtn->setFlat( true );
         debugWindowBtn->setCheckable( true );
-        connect( debugWindowBtn, &QPushButton::clicked,
+        connect( debugWindowBtn, &QPushButton::clicked, this, [=]( bool checked ) {
-                 this, [ = ]( bool checked )
-        {
             if ( checked )
             {
                 m_debugWindow = new Calamares::DebugWindow();
                 m_debugWindow->show();
-                connect( m_debugWindow.data(), &Calamares::DebugWindow::closed,
+                connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() {
-                         this, [ = ]()
-                {
                     m_debugWindow->deleteLater();
                     debugWindowBtn->setChecked( false );
                 } );
@@ -156,8 +156,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
             else
             {
                 if ( m_debugWindow )
+                {
                     m_debugWindow->deleteLater();
                 }
+            }
         } );
     }
 
@@ -166,7 +168,9 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
 
     m_viewManager = Calamares::ViewManager::instance( this );
     if ( branding->windowExpands() )
+    {
         connect( m_viewManager, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge );
+    }
     // NOTE: Although the ViewManager has a signal cancelEnabled() that
     //       signals when the state of the cancel button changes (in
     //       particular, to disable cancel during the exec phase),
@@ -201,5 +205,7 @@ CalamaresWindow::closeEvent( QCloseEvent* event )
         qApp->quit();
     }
     else
+    {
         event->ignore();
     }
+}

src/calamares/CalamaresWindow.h

@@ -27,7 +27,7 @@ namespace Calamares
 {
 class DebugWindow;
 class ViewManager;
-}
+}  // namespace Calamares
 
 /**
  * @brief The CalamaresWindow class represents the main window of the Calamares UI.

src/calamares/main.cpp

@@ -24,11 +24,10 @@
 #include "kdsingleapplicationguard/kdsingleapplicationguard.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
-#include "CalamaresConfig.h"
 
 #ifdef WITH_KF5Crash
-#include <KF5/KCrash/KCrash>
 #include <KF5/KCoreAddons/KAboutData>
+#include <KF5/KCrash/KCrash>
 #endif
 
 #include <QCommandLineParser>
@@ -40,12 +39,11 @@ handle_args( CalamaresApplication& a )
 {
     QCommandLineOption debugOption( QStringList { "d", "debug" },
                                     "Also look in current directory for configuration. Implies -D8." );
-    QCommandLineOption debugLevelOption( QStringLiteral("D"),
+    QCommandLineOption debugLevelOption(
-                                          "Verbose output for debugging purposes (0-8).", "level" );
+        QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8).", "level" );
-    QCommandLineOption configOption( QStringList{ "c", "config"},
+    QCommandLineOption configOption(
-                                     "Configuration directory to use, for testing purposes.", "config" );
+        QStringList { "c", "config" }, "Configuration directory to use, for testing purposes.", "config" );
-    QCommandLineOption xdgOption( QStringList{"X", "xdg-config"},
+    QCommandLineOption xdgOption( QStringList { "X", "xdg-config" }, "Use XDG_{CONFIG,DATA}_DIRS as well." );
-                                  "Use XDG_{CONFIG,DATA}_DIRS as well." );
 
     QCommandLineParser parser;
     parser.setApplicationDescription( "Distribution-independent installer framework" );
@@ -61,23 +59,33 @@ handle_args( CalamaresApplication& a )
 
     a.setDebug( parser.isSet( debugOption ) );
     if ( parser.isSet( debugOption ) )
+    {
         Logger::setupLogLevel( Logger::LOGVERBOSE );
+    }
     else if ( parser.isSet( debugLevelOption ) )
     {
         bool ok = true;
         int l = parser.value( debugLevelOption ).toInt( &ok );
         unsigned int dlevel = 0;
         if ( !ok || ( l < 0 ) )
+        {
             dlevel = Logger::LOGVERBOSE;
+        }
         else
+        {
             dlevel = static_cast< unsigned int >( l );  // l >= 0
+        }
         Logger::setupLogLevel( dlevel );
     }
     if ( parser.isSet( configOption ) )
+    {
         CalamaresUtils::setAppDataDir( QDir( parser.value( configOption ) ) );
+    }
     if ( parser.isSet( xdgOption ) )
+    {
         CalamaresUtils::setXdgDirs();
     }
+}
 
 int
 main( int argc, char* argv[] )
@@ -118,10 +126,14 @@ main( int argc, char* argv[] )
         auto instancelist = guard.instances();
         qDebug() << "Calamares is already running, shutting down.";
         if ( instancelist.count() > 0 )
+        {
             qDebug() << "Other running Calamares instances:";
+        }
         for ( const auto& i : instancelist )
+        {
             qDebug() << "  " << i.isValid() << i.pid() << i.arguments();
         }
+    }
 
     return returnCode;
 }

src/calamares/testmain.cpp

@@ -22,9 +22,9 @@
  * bindings.
  */
 
+#include "modulesystem/Module.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
-#include "modulesystem/Module.h"
 
 #include "GlobalStorage.h"
 #include "Job.h"
@@ -40,10 +40,26 @@
 
 struct ModuleConfig
 {
-    QString moduleName() const { return m_module; }
+    QString
-    QString configFile() const { return m_jobConfig; }
+    moduleName() const
-    QString language() const { return m_language; }
+    {
-    QString globalConfigFile() const { return m_globalConfig; }
+        return m_module;
+    }
+    QString
+    configFile() const
+    {
+        return m_jobConfig;
+    }
+    QString
+    language() const
+    {
+        return m_language;
+    }
+    QString
+    globalConfigFile() const
+    {
+        return m_globalConfig;
+    }
 
     QString m_module;
     QString m_jobConfig;
@@ -54,14 +70,17 @@ struct ModuleConfig
 static ModuleConfig
 handle_args( QCoreApplication& a )
 {
-    QCommandLineOption debugLevelOption( QStringLiteral("D"),
+    QCommandLineOption debugLevelOption(
-                                          "Verbose output for debugging purposes (0-8).", "level" );
+        QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8).", "level" );
     QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ),
-                                     QStringLiteral( "Global settings document" ), "global.yaml" );
+                                     QStringLiteral( "Global settings document" ),
+                                     "global.yaml" );
     QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job" ),
-                                  QStringLiteral( "Job settings document" ), "job.yaml" );
+                                  QStringLiteral( "Job settings document" ),
+                                  "job.yaml" );
     QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
-                                   QStringLiteral( "Language (global)" ), "languagecode" );
+                                   QStringLiteral( "Language (global)" ),
+                                   "languagecode" );
 
     QCommandLineParser parser;
     parser.setApplicationDescription( "Calamares module tester" );
@@ -83,9 +102,13 @@ handle_args( QCoreApplication& a )
         unsigned int l = parser.value( debugLevelOption ).toUInt( &ok );
         unsigned int dlevel = 0;
         if ( !ok )
+        {
             dlevel = Logger::LOGVERBOSE;
+        }
         else
+        {
             dlevel = l;
+        }
         Logger::setupLogLevel( dlevel );
     }
 
@@ -104,7 +127,9 @@ handle_args( QCoreApplication& a )
     {
         QString jobSettings( parser.value( jobOption ) );
         if ( jobSettings.isEmpty() && ( args.size() == 2 ) )
+        {
             jobSettings = args.at( 1 );
+        }
 
         return ModuleConfig { args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
     }
@@ -125,9 +150,13 @@ load_module( const ModuleConfig& moduleConfig )
         // Could be a complete path, eg. src/modules/dummycpp/module.desc
         fi = QFileInfo( prefix + moduleName );
         if ( fi.exists() && fi.isFile() )
+        {
             descriptor = CalamaresUtils::loadYaml( fi, &ok );
+        }
         if ( ok )
+        {
             break;
+        }
 
         // Could be a path without module.desc
         fi = QFileInfo( prefix + moduleName );
@@ -135,8 +164,13 @@ load_module( const ModuleConfig& moduleConfig )
         {
             fi = QFileInfo( prefix + moduleName + "/module.desc" );
             if ( fi.exists() && fi.isFile() )
+            {
                 descriptor = CalamaresUtils::loadYaml( fi, &ok );
-            if ( ok ) break;
+            }
+            if ( ok )
+            {
+                break;
+            }
         }
     }
 
@@ -154,15 +188,12 @@ load_module( const ModuleConfig& moduleConfig )
     }
 
     QString moduleDirectory = fi.absolutePath();
-    QString configFile(
+    QString configFile( moduleConfig.configFile().isEmpty() ? moduleDirectory + '/' + name + ".conf"
-        moduleConfig.configFile().isEmpty()
-        ? moduleDirectory + '/' + name + ".conf"
                                                             : moduleConfig.configFile() );
 
     cDebug() << "Module" << moduleName << "job-configuration:" << configFile;
 
-    Calamares::Module* module = Calamares::Module::fromDescriptor(
+    Calamares::Module* module = Calamares::Module::fromDescriptor( descriptor, name, configFile, moduleDirectory );
-        descriptor, name, configFile, moduleDirectory );
 
     return module;
 }
@@ -174,14 +205,18 @@ main( int argc, char* argv[] )
 
     ModuleConfig module = handle_args( a );
     if ( module.moduleName().isEmpty() )
+    {
         return 1;
+    }
 
     std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) );
     std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
 
     auto gs = jobqueue_p->globalStorage();
     if ( !module.globalConfigFile().isEmpty() )
+    {
         gs->loadYaml( module.globalConfigFile() );
+    }
     if ( !module.language().isEmpty() )
     {
         QVariantMap vm;
@@ -199,7 +234,9 @@ main( int argc, char* argv[] )
     }
 
     if ( !m->isLoaded() )
+    {
         m->loadSelf();
+    }
 
     if ( !m->isLoaded() )
     {
@@ -209,9 +246,7 @@ main( int argc, char* argv[] )
 
     using TR = Logger::DebugRow< const char*, const QString >;
 
-    cDebug() << "Module metadata"
+    cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() )
-        << TR( "name", m->name() )
-        << TR( "type", m->typeString() )
              << TR( "interface", m->interfaceString() );
 
     cDebug() << "Job outputs:";
@@ -224,12 +259,12 @@ main( int argc, char* argv[] )
         Calamares::JobResult r = p->exec();
         if ( !r )
         {
-            cError() << "Job #" << count << "failed"
+            cError() << "Job #" << count << "failed" << TR( "summary", r.message() ) << TR( "details", r.details() );
-                << TR( "summary", r.message() )
-                << TR( "details", r.details() );
             if ( r.errorCode() > 0 )
+            {
                 ++failure_count;
             }
+        }
         ++count;
     }