Merge branch 'master' of https://github.com/calamares/calamares into development

3rdparty/qjsonitem.cpp

@@ -1,140 +0,0 @@
-/*
- *   SPDX-License-Identifier: GPL-3.0+
- *   License-Filename: LICENSES/GPLv3+-QJsonModel
- */
-
-/***********************************************
-    Copyright (C) 2014  Schutz Sacha
-    This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
-
-    QJsonModel is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QJsonModel is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QJsonModel.  If not, see <http://www.gnu.org/licenses/>.
-
-**********************************************/
-
-#include "qjsonitem.h"
-
-QJsonTreeItem::QJsonTreeItem(QJsonTreeItem *parent)
-    : mParent( parent )
-    , mType( QJsonValue::Type::Null )
-{
-}
-
-QJsonTreeItem::~QJsonTreeItem()
-{
-    qDeleteAll(mChilds);
-
-}
-
-void QJsonTreeItem::appendChild(QJsonTreeItem *item)
-{
-    mChilds.append(item);
-}
-
-QJsonTreeItem *QJsonTreeItem::child(int row)
-{
-    return mChilds.value(row);
-}
-
-QJsonTreeItem *QJsonTreeItem::parent()
-{
-    return mParent;
-}
-
-int QJsonTreeItem::childCount() const
-{
-    return mChilds.count();
-}
-
-int QJsonTreeItem::row() const
-{
-    if (mParent)
-        return mParent->mChilds.indexOf(const_cast<QJsonTreeItem*>(this));
-
-    return 0;
-}
-
-void QJsonTreeItem::setKey(const QString &key)
-{
-    mKey = key;
-}
-
-void QJsonTreeItem::setValue(const QString &value)
-{
-    mValue = value;
-}
-
-void QJsonTreeItem::setType(const QJsonValue::Type &type)
-{
-    mType = type;
-}
-
-QString QJsonTreeItem::key() const
-{
-    return mKey;
-}
-
-QString QJsonTreeItem::value() const
-{
-    return mValue;
-}
-
-QJsonValue::Type QJsonTreeItem::type() const
-{
-    return mType;
-}
-
-QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* parent)
-{
-
-
-    QJsonTreeItem * rootItem = new QJsonTreeItem(parent);
-    rootItem->setKey("root");
-
-    if ( value.isObject())
-    {
-
-        //Get all QJsonValue childs
-        foreach (QString key , value.toObject().keys()){
-            QJsonValue v = value.toObject().value(key);
-            QJsonTreeItem * child = load(v,rootItem);
-            child->setKey(key);
-            child->setType(v.type());
-            rootItem->appendChild(child);
-
-        }
-
-    }
-
-    else if ( value.isArray())
-    {
-        //Get all QJsonValue childs
-        int index = 0;
-        foreach (QJsonValue v , value.toArray()){
-
-            QJsonTreeItem * child = load(v,rootItem);
-            child->setKey(QString::number(index));
-            child->setType(v.type());
-            rootItem->appendChild(child);
-            ++index;
-        }
-    }
-    else
-    {
-        rootItem->setValue(value.toVariant().toString());
-        rootItem->setType(value.type());
-    }
-
-    return rootItem;
-}
-

3rdparty/qjsonitem.h

@@ -1,46 +0,0 @@
-/*
- *   SPDX-License-Identifier: GPL-3.0+
- *   License-Filename: LICENSES/GPLv3+-QJsonModel
- */
-
-#ifndef JSONITEM_H
-#define JSONITEM_H
-#include <QtCore>
-#include <QJsonValue>
-#include <QJsonArray>
-#include <QJsonObject>
-class QJsonTreeItem
-{
-public:
-    QJsonTreeItem(QJsonTreeItem * parent = nullptr);
-    ~QJsonTreeItem();
-    void appendChild(QJsonTreeItem * item);
-    QJsonTreeItem *child(int row);
-    QJsonTreeItem *parent();
-    int childCount() const;
-    int row() const;
-    void setKey(const QString& key);
-    void setValue(const QString& value);
-    void setType(const QJsonValue::Type& type);
-    QString key() const;
-    QString value() const;
-    QJsonValue::Type type() const;
-
-
-    static QJsonTreeItem* load(const QJsonValue& value, QJsonTreeItem * parent = nullptr);
-
-protected:
-
-
-private:
-    QString mKey;
-    QString mValue;
-    QJsonValue::Type mType;
-
-    QList<QJsonTreeItem*> mChilds;
-    QJsonTreeItem * mParent;
-
-
-};
-
-#endif // JSONITEM_H

3rdparty/qjsonmodel.cpp

@@ -1,186 +0,0 @@
-/*
- *   SPDX-License-Identifier: GPL-3.0+
- *   License-Filename: LICENSES/GPLv3+-QJsonModel
- */
-
-/***********************************************
-    Copyright (C) 2014  Schutz Sacha
-    This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
-
-    QJsonModel is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QJsonModel is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QJsonModel.  If not, see <http://www.gnu.org/licenses/>.
-
-**********************************************/
-
-#include "qjsonmodel.h"
-#include <QFile>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QIcon>
-#include <QFont>
-
-QJsonModel::QJsonModel(QObject *parent) :
-    QAbstractItemModel(parent)
-    , mRootItem( new QJsonTreeItem )
-{
-    mHeaders.append("key");
-    mHeaders.append("value");
-
-
-}
-
-QJsonModel::~QJsonModel()
-{
-    delete mRootItem;
-}
-
-bool QJsonModel::load(const QString &fileName)
-{
-    QFile file(fileName);
-    bool success = false;
-    if (file.open(QIODevice::ReadOnly)) {
-        success = load(&file);
-        file.close();
-    }
-    else success = false;
-
-    return success;
-}
-
-bool QJsonModel::load(QIODevice *device)
-{
-    return loadJson(device->readAll());
-}
-
-bool QJsonModel::loadJson(const QByteArray &json)
-{
-    mDocument = QJsonDocument::fromJson(json);
-
-    if (!mDocument.isNull())
-    {
-        beginResetModel();
-        delete mRootItem;
-        if (mDocument.isArray()) {
-            mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.array()));
-        } else {
-            mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.object()));
-        }
-        endResetModel();
-        return true;
-    }
-    return false;
-}
-
-
-QVariant QJsonModel::data(const QModelIndex &index, int role) const
-{
-
-    if (!index.isValid())
-        return QVariant();
-
-
-    QJsonTreeItem *item = static_cast<QJsonTreeItem*>(index.internalPointer());
-
-
-    if ((role == Qt::DecorationRole) && (index.column() == 0)){
-
-        return mTypeIcons.value(item->type());
-    }
-
-
-    if (role == Qt::DisplayRole) {
-
-        if (index.column() == 0)
-            return QString("%1").arg(item->key());
-
-        if (index.column() == 1)
-            return QString("%1").arg(item->value());
-    }
-
-
-
-    return QVariant();
-
-}
-
-QVariant QJsonModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal) {
-
-        return mHeaders.value(section);
-    }
-    else
-        return QVariant();
-}
-
-QModelIndex QJsonModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (!hasIndex(row, column, parent))
-        return QModelIndex();
-
-    QJsonTreeItem *parentItem;
-
-    if (!parent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<QJsonTreeItem*>(parent.internalPointer());
-
-    QJsonTreeItem *childItem = parentItem->child(row);
-    if (childItem)
-        return createIndex(row, column, childItem);
-    else
-        return QModelIndex();
-}
-
-QModelIndex QJsonModel::parent(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return QModelIndex();
-
-    QJsonTreeItem *childItem = static_cast<QJsonTreeItem*>(index.internalPointer());
-    QJsonTreeItem *parentItem = childItem->parent();
-
-    if (parentItem == mRootItem)
-        return QModelIndex();
-
-    return createIndex(parentItem->row(), 0, parentItem);
-}
-
-int QJsonModel::rowCount(const QModelIndex &parent) const
-{
-    QJsonTreeItem *parentItem;
-    if (parent.column() > 0)
-        return 0;
-
-    if (!parent.isValid())
-        parentItem = mRootItem;
-    else
-        parentItem = static_cast<QJsonTreeItem*>(parent.internalPointer());
-
-    return parentItem->childCount();
-}
-
-int QJsonModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return 2;
-}
-
-void QJsonModel::setIcon(const QJsonValue::Type &type, const QIcon &icon)
-{
-    mTypeIcons.insert(type,icon);
-}

3rdparty/qjsonmodel.h

@@ -1,42 +0,0 @@
-/*
- *   SPDX-License-Identifier: GPL-3.0+
- *   License-Filename: LICENSES/GPLv3+-QJsonModel
- */
-
-#ifndef QJSONMODEL_H
-#define QJSONMODEL_H
-
-#include <QAbstractItemModel>
-#include "qjsonitem.h"
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QIcon>
-class QJsonModel : public QAbstractItemModel
-{
-    Q_OBJECT
-public:
-    explicit QJsonModel(QObject *parent = nullptr);
-    ~QJsonModel();
-    bool load(const QString& fileName);
-    bool load(QIODevice * device);
-    bool loadJson(const QByteArray& json);
-    QVariant data(const QModelIndex &index, int role) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    QModelIndex index(int row, int column,const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &index) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    void setIcon(const QJsonValue::Type& type, const QIcon& icon);
-
-
-
-private:
-    QJsonTreeItem * mRootItem;
-    QJsonDocument mDocument;
-    QStringList mHeaders;
-    QHash<QJsonValue::Type, QIcon> mTypeIcons;
-
-
-};
-
-#endif // QJSONMODEL_H

LICENSES/GPLv3+-QJsonModel

@@ -1,18 +0,0 @@
-/***********************************************
-    Copyright (C) 2014  Schutz Sacha
-    This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
-
-    QJsonModel is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QJsonModel is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QJsonModel.  If not, see <http://www.gnu.org/licenses/>.
-
-**********************************************/

src/calamares/CMakeLists.txt

@@ -5,6 +5,9 @@ set( calamaresSources
     CalamaresApplication.cpp
     CalamaresWindow.cpp
 
+    DebugWindow.cpp
+    VariantModel.cpp
+
     progresstree/ProgressTreeDelegate.cpp
     progresstree/ProgressTreeItem.cpp
     progresstree/ProgressTreeModel.cpp
@@ -35,6 +38,7 @@ set_target_properties(calamares_bin
         RUNTIME_OUTPUT_NAME calamares
 )
 calamares_automoc( calamares_bin )
+calamares_autouic( calamares_bin )
 
 target_link_libraries( calamares_bin
     PRIVATE

src/calamares/CalamaresWindow.cpp

@@ -22,11 +22,11 @@
 #include "CalamaresWindow.h"
 
 #include "Branding.h"
+#include "DebugWindow.h"
 #include "Settings.h"
 #include "ViewManager.h"
 #include "progresstree/ProgressTreeView.h"
 #include "utils/CalamaresUtilsGui.h"
-#include "utils/DebugWindow.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 

src/calamares/DebugWindow.cpp

@@ -20,6 +20,8 @@
 #include "DebugWindow.h"
 #include "ui_DebugWindow.h"
 
+#include "VariantModel.h"
+
 #include "Branding.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
@@ -30,8 +32,6 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
-#include "3rdparty/qjsonmodel.h"
-
 #ifdef WITH_PYTHONQT
 #include "ViewManager.h"
 #include "viewpages/PythonQtViewStep.h"
@@ -39,10 +39,10 @@
 #include <gui/PythonQtScriptingConsole.h>
 #endif
 
-#include <QJsonDocument>
 #include <QSplitter>
 #include <QStringListModel>
 #include <QTreeView>
+#include <QWidget>
 
 /**
  * @brief crash makes Calamares crash immediately.
@@ -55,50 +55,56 @@ crash()
 }
 
 /// @brief Print out the widget tree (names) in indented form.
-static void dumpWidgetTree( QDebug& deb, const QWidget* widget, int depth )
+static void
+dumpWidgetTree( QDebug& deb, const QWidget* widget, int depth )
 {
     if ( !widget )
+    {
         return;
+    }
 
     deb << Logger::Continuation;
-    for (int i = 0; i < depth; ++i )
+    for ( int i = 0; i < depth; ++i )
+    {
         deb << ' ';
+    }
     deb << widget->objectName();
 
-    for ( const auto* w : widget->findChildren<QWidget*>( QString(), Qt::FindDirectChildrenOnly ) )
+    for ( const auto* w : widget->findChildren< QWidget* >( QString(), Qt::FindDirectChildrenOnly ) )
-        dumpWidgetTree( deb, w, depth+1 );
+    {
+        dumpWidgetTree( deb, w, depth + 1 );
+    }
 }
 
-namespace Calamares {
+namespace Calamares
+{
 
 DebugWindow::DebugWindow()
     : QWidget( nullptr )
     , m_ui( new Ui::DebugWindow )
+    , m_globals( JobQueue::instance()->globalStorage()->data() )
+    , m_globals_model( std::make_unique< VariantModel >( &m_globals ) )
+    , m_module_model( std::make_unique< VariantModel >( &m_module ) )
 {
-    m_ui->setupUi( this );
-
-    // GlobalStorage page
-    QJsonModel* jsonModel = new QJsonModel( this );
-
-    m_ui->globalStorageView->setModel( jsonModel );
     GlobalStorage* gs = JobQueue::instance()->globalStorage();
 
-    connect( gs, &GlobalStorage::changed,
+    m_ui->setupUi( this );
-             this, [ = ]
+
-    {
+    m_ui->globalStorageView->setModel( m_globals_model.get() );
-        jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
+    m_ui->globalStorageView->expandAll();
+
+    // Do above when the GS changes, too
+    connect( gs, &GlobalStorage::changed, this, [=] {
+        m_globals = JobQueue::instance()->globalStorage()->data();
+        m_globals_model->reload();
         m_ui->globalStorageView->expandAll();
     } );
-    jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
-    m_ui->globalStorageView->expandAll();
 
     // JobQueue page
     m_ui->jobQueueText->setReadOnly( true );
-    connect( JobQueue::instance(), &JobQueue::queueChanged,
+    connect( JobQueue::instance(), &JobQueue::queueChanged, this, [this]( const JobList& jobs ) {
-             this, [ this ]( const JobList& jobs )
-    {
         QStringList text;
-        for ( const auto &job : jobs )
+        for ( const auto& job : jobs )
         {
             text.append( job->prettyName() );
         }
@@ -111,8 +117,7 @@ DebugWindow::DebugWindow()
     m_ui->modulesListView->setModel( modulesModel );
     m_ui->modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );
 
-    QJsonModel* moduleConfigModel = new QJsonModel( this );
+    m_ui->moduleConfigView->setModel( m_module_model.get() );
-    m_ui->moduleConfigView->setModel( moduleConfigModel );
 
 #ifdef WITH_PYTHONQT
     QPushButton* pythonConsoleButton = new QPushButton;
@@ -120,21 +125,17 @@ DebugWindow::DebugWindow()
     m_ui->modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
     pythonConsoleButton->hide();
 
-    QObject::connect( pythonConsoleButton, &QPushButton::clicked,
+    QObject::connect( pythonConsoleButton, &QPushButton::clicked, this, [this, moduleConfigModel] {
-                      this, [ this, moduleConfigModel ]
-    {
         QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
         Module* module = ModuleManager::instance()->moduleInstance( moduleName );
-        if ( module->interface() != Module::Interface::PythonQt ||
+        if ( module->interface() != Module::Interface::PythonQt || module->type() != Module::Type::View )
-             module->type() != Module::Type::View )
             return;
 
         for ( ViewStep* step : ViewManager::instance()->viewSteps() )
         {
             if ( step->moduleInstanceKey() == module->instanceKey() )
             {
-                PythonQtViewStep* pqvs =
+                PythonQtViewStep* pqvs = qobject_cast< PythonQtViewStep* >( step );
-                    qobject_cast< PythonQtViewStep* >( step );
                 if ( pqvs )
                 {
                     QWidget* consoleWindow = new QWidget;
@@ -151,23 +152,17 @@ DebugWindow::DebugWindow()
 
                     QLabel* bottomLabel = new QLabel( consoleWindow );
                     bottomLayout->addWidget( bottomLabel );
-                    QString line =
+                    QString line = QString( "Module: <font color=\"#008000\"><code>%1</code></font><br/>"
-                        QString( "Module: <font color=\"#008000\"><code>%1</code></font><br/>"
+                                            "Python class: <font color=\"#008000\"><code>%2</code></font>" )
-                                 "Python class: <font color=\"#008000\"><code>%2</code></font>" )
+                                       .arg( module->instanceKey() )
-                            .arg( module->instanceKey() )
+                                       .arg( console->property( "classname" ).toString() );
-                            .arg( console->property( "classname" ).toString() );
                     bottomLabel->setText( line );
 
                     QPushButton* closeButton = new QPushButton( consoleWindow );
                     closeButton->setText( "&Close" );
-                    QObject::connect( closeButton, &QPushButton::clicked,
+                    QObject::connect( closeButton, &QPushButton::clicked, [consoleWindow] { consoleWindow->close(); } );
-                                      [ consoleWindow ]
-                    {
-                        consoleWindow->close();
-                    } );
                     bottomLayout->addWidget( closeButton );
-                    bottomLabel->setSizePolicy( QSizePolicy::Expanding,
+                    bottomLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-                                                QSizePolicy::Preferred );
 
                     consoleWindow->setParent( this );
                     consoleWindow->setWindowFlags( Qt::Window );
@@ -182,57 +177,52 @@ DebugWindow::DebugWindow()
 
 #endif
 
-    connect( m_ui->modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
+    connect( m_ui->modulesListView->selectionModel(),
-             this, [ this, moduleConfigModel
+             &QItemSelectionModel::selectionChanged,
+             this,
+             [this
 #ifdef WITH_PYTHONQT
-             , pythonConsoleButton
+              ,
+              pythonConsoleButton
 #endif
-             ]
+    ] {
-    {
+                 QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
-        QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
+                 Module* module = ModuleManager::instance()->moduleInstance( moduleName );
-        Module* module = ModuleManager::instance()->moduleInstance( moduleName );
+                 if ( module )
-        if ( module )
+                 {
-        {
+                     m_module = module->configurationMap();
-            moduleConfigModel->loadJson( QJsonDocument::fromVariant( module->configurationMap() ).toJson() );
+                     m_module_model->reload();
-            m_ui->moduleConfigView->expandAll();
+                     m_ui->moduleConfigView->expandAll();
-            m_ui->moduleTypeLabel->setText( module->typeString() );
+                     m_ui->moduleTypeLabel->setText( module->typeString() );
-            m_ui->moduleInterfaceLabel->setText( module->interfaceString() );
+                     m_ui->moduleInterfaceLabel->setText( module->interfaceString() );
 #ifdef WITH_PYTHONQT
-            pythonConsoleButton->setVisible(
+                     pythonConsoleButton->setVisible( module->interface() == Module::Interface::PythonQt
-                        module->interface() == Module::Interface::PythonQt &&
+                                                      && module->type() == Module::Type::View );
-                        module->type() == Module::Type::View );
 #endif
-        }
+                 }
-    } );
+             } );
 
     // Tools page
     connect( m_ui->crashButton, &QPushButton::clicked, this, [] { ::crash(); } );
-    connect( m_ui->reloadStylesheetButton, &QPushButton::clicked,
+    connect( m_ui->reloadStylesheetButton, &QPushButton::clicked, []() {
-             []()
+        for ( auto* w : qApp->topLevelWidgets() )
-             {
+        {
-                 for ( auto* w : qApp->topLevelWidgets() )
+            // Needs to match what's set in CalamaresWindow
-                 {
+            if ( w->objectName() == QStringLiteral( "mainApp" ) )
-                     // Needs to match what's set in CalamaresWindow
+            {
-                     if ( w->objectName() == QStringLiteral( "mainApp" ) )
+                w->setStyleSheet( Calamares::Branding::instance()->stylesheet() );
-                     {
+            }
-                         w->setStyleSheet( Calamares::Branding::instance()->stylesheet() );
+        }
-                     }
+    } );
-                 }
+    connect( m_ui->widgetTreeButton, &QPushButton::clicked, []() {
-             });
+        for ( auto* w : qApp->topLevelWidgets() )
-    connect( m_ui->widgetTreeButton, &QPushButton::clicked,
+        {
-             []()
+            Logger::CDebug deb;
-             {
+            dumpWidgetTree( deb, w, 0 );
-                 for ( auto* w : qApp->topLevelWidgets() )
+        }
-                 {
+    } );
-                     Logger::CDebug deb;
-                     dumpWidgetTree( deb, w, 0 );
-                 }
-             });
 
-    CALAMARES_RETRANSLATE(
+    CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); )
-        m_ui->retranslateUi( this );
-        setWindowTitle( tr( "Debug information" ) );
-    )
 }
 
 
@@ -243,4 +233,4 @@ DebugWindow::closeEvent( QCloseEvent* e )
     emit closed();
 }
 
-} // namespace Calamares
+}  // namespace Calamares

src/calamares/DebugWindow.h

@@ -20,15 +20,20 @@
 #ifndef CALAMARES_DEBUGWINDOW_H
 #define CALAMARES_DEBUGWINDOW_H
 
+#include "VariantModel.h"
+
+#include <QVariant>
 #include <QWidget>
 
+#include <memory>
 
-namespace Calamares {
+namespace Calamares
+{
 
 // From the .ui file
 namespace Ui
 {
-    class DebugWindow;
+class DebugWindow;
 }
 
 class DebugWindow : public QWidget
@@ -45,9 +50,13 @@ protected:
     void closeEvent( QCloseEvent* e ) override;
 
 private:
-    Ui::DebugWindow *m_ui;
+    Ui::DebugWindow* m_ui;
+    QVariant m_globals;
+    QVariant m_module;
+    std::unique_ptr< VariantModel > m_globals_model;
+    std::unique_ptr< VariantModel > m_module_model;
 };
 
 
-}  // namespace
+}  // namespace Calamares
 #endif

src/calamares/VariantModel.cpp

@@ -0,0 +1,280 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "VariantModel.h"
+
+static void
+overallLength( const QVariant& item, quintptr& c, quintptr parent, VariantModel::IndexVector* skiplist )
+{
+    if ( skiplist )
+    {
+        skiplist->append( parent );
+    }
+
+    parent = c++;
+    if ( item.canConvert< QVariantList >() )
+    {
+        for ( const auto& subitem : item.toList() )
+        {
+            overallLength( subitem, c, parent, skiplist );
+        }
+    }
+    else if ( item.canConvert< QVariantMap >() )
+    {
+        for ( const auto& subitem : item.toMap() )
+        {
+            overallLength( subitem, c, parent, skiplist );
+        }
+    }
+}
+
+static quintptr
+findNth( const VariantModel::IndexVector& skiplist, quintptr value, int n )
+{
+    constexpr const quintptr invalid_index = static_cast< quintptr >( -1 );
+
+    if ( n < 0 )
+    {
+        return invalid_index;
+    }
+
+    int index = static_cast< int >( value );
+    while ( ( n >= 0 ) && ( index < skiplist.count() ) )
+    {
+        if ( skiplist[ index ] == value )
+        {
+            if ( --n < 0 )
+            {
+                // It's bigger than 0
+                return static_cast< quintptr >( index );
+            }
+        }
+        index++;
+    }
+    return invalid_index;
+}
+
+
+VariantModel::VariantModel( const QVariant* p )
+    : m_p( p )
+{
+    reload();
+}
+
+VariantModel::~VariantModel() {}
+
+void
+VariantModel::reload()
+{
+    constexpr const quintptr invalid_index = static_cast< quintptr >( -1 );
+
+    quintptr x = 0;
+    m_rows.clear();  // Start over
+    if ( m_rows.capacity() < 64 )
+    {
+        m_rows.reserve( 64 );  // Start reasonably-sized
+    }
+    overallLength( *m_p, x, invalid_index, &m_rows );
+}
+
+int
+VariantModel::columnCount( const QModelIndex& ) const
+{
+    return 2;
+}
+
+int
+VariantModel::rowCount( const QModelIndex& index ) const
+{
+    quintptr p = index.isValid() ? index.internalId() : 0;
+    return m_rows.count( p );
+}
+
+QModelIndex
+VariantModel::index( int row, int column, const QModelIndex& parent ) const
+{
+    quintptr p = 0;
+
+    if ( parent.isValid() )
+    {
+        if ( inRange( parent ) )
+        {
+            p = parent.internalId();
+        }
+    }
+
+    return createIndex( row, column, findNth( m_rows, p, row ) );
+}
+
+static inline quintptr
+deref( const VariantModel::IndexVector& v, quintptr i )
+{
+    return v[ static_cast< int >( i ) ];
+}
+
+QModelIndex
+VariantModel::parent( const QModelIndex& index ) const
+{
+    if ( !index.isValid() || !inRange( index ) )
+    {
+        return QModelIndex();
+    }
+
+    quintptr p = deref( m_rows, index.internalId() );
+    if ( p == 0 )
+    {
+        return QModelIndex();
+    }
+
+    if ( !inRange( p ) )
+    {
+        return QModelIndex();
+    }
+    quintptr p_pid = deref( m_rows, p );
+    int row = 0;
+    for ( int i = static_cast< int >( p_pid ); i < static_cast< int >( p ); ++i )
+    {
+        if ( m_rows[ i ] == p_pid )
+        {
+            row++;
+        }
+    }
+
+    return createIndex( row, index.column(), p );
+}
+
+QVariant
+VariantModel::data( const QModelIndex& index, int role ) const
+{
+    if ( role != Qt::DisplayRole )
+    {
+        return QVariant();
+    }
+
+    if ( !index.isValid() )
+    {
+        return QVariant();
+    }
+
+    if ( ( index.column() < 0 ) || ( index.column() > 1 ) )
+    {
+        return QVariant();
+    }
+
+    if ( !inRange( index ) )
+    {
+        return QVariant();
+    }
+
+    const QVariant thing = underlying( parent( index ) );
+
+    if ( !thing.isValid() )
+    {
+        return QVariant();
+    }
+
+    if ( thing.canConvert< QVariantMap >() )
+    {
+        QVariantMap the_map = thing.toMap();
+        const auto key = the_map.keys().at( index.row() );
+        if ( index.column() == 0 )
+        {
+            return key;
+        }
+        else
+        {
+            return the_map[ key ];
+        }
+    }
+    else if ( thing.canConvert< QVariantList >() )
+    {
+        if ( index.column() == 0 )
+        {
+            return index.row();
+        }
+        else
+        {
+            QVariantList the_list = thing.toList();
+            return the_list.at( index.row() );
+        }
+    }
+    else
+    {
+        if ( index.column() == 0 )
+        {
+            return QVariant();
+        }
+        else
+        {
+            return thing;
+        }
+    }
+}
+
+QVariant
+VariantModel::headerData( int section, Qt::Orientation orientation, int role ) const
+{
+    if ( role != Qt::DisplayRole )
+    {
+        return QVariant();
+    }
+
+    if ( orientation == Qt::Horizontal )
+    {
+        if ( section == 0 )
+        {
+            return tr( "Key" );
+        }
+        else if ( section == 1 )
+        {
+            return tr( "Value" );
+        }
+        else
+        {
+            return QVariant();
+        }
+    }
+    else
+    {
+        return QVariant();
+    }
+}
+
+const QVariant
+VariantModel::underlying( const QModelIndex& index ) const
+{
+    if ( !index.isValid() )
+    {
+        return *m_p;
+    }
+
+    const auto& thing = underlying( parent( index ) );
+    if ( thing.canConvert< QVariantMap >() )
+    {
+        const auto& the_map = thing.toMap();
+        return the_map[ the_map.keys()[ index.row() ] ];
+    }
+    else if ( thing.canConvert< QVariantList >() )
+    {
+        return thing.toList()[ index.row() ];
+    }
+    else
+    {
+        return thing;
+    }
+}

src/calamares/VariantModel.h

@@ -0,0 +1,112 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VARIANTMODEL_H
+#define VARIANTMODEL_H
+
+#include <QAbstractItemModel>
+#include <QVariantMap>
+#include <QVector>
+
+/** @brief A model that operates directly on a QVariant
+ *
+ * A VariantModel operates directly on an underlying
+ * QVariant, treating QVariantMap and QVariantList as
+ * nodes with multiple children. In general, putting
+ * a QVariantMap into a QVariant and passing that into
+ * the model will get you a tree-like model of the
+ * VariantMap's data structure.
+ *
+ * Take care of object lifetimes and that the underlying
+ * QVariant does not change during use. If the QVariant
+ * **does** change, call reload() to re-build the internal
+ * representation of the tree.
+ */
+class VariantModel : public QAbstractItemModel
+{
+public:
+    /** @brief Auxiliary data
+     *
+     * The nodes of the tree are enumerated into a vector
+     * (of length equal to the number of nodes in the tree + 1)
+     * which are used to do index and parent calculations.
+     */
+    using IndexVector = QVector< quintptr >;
+
+    /** @brief Constructor
+     *
+     * The QVariant's lifetime is **not** affected by the model,
+     * so take care that the QVariant lives at least as long as
+     * the model). Also, don't change the QVariant underneath the model.
+     */
+    VariantModel( const QVariant* p );
+
+    ~VariantModel() override;
+
+    /** @brief Re-build the internal tree
+     *
+     * Call this when the underlying variant is changed, which
+     * might impact how the tree is laid out.
+     */
+    void reload();
+
+    int columnCount( const QModelIndex& index ) const override;
+    int rowCount( const QModelIndex& index ) const override;
+
+    QModelIndex index( int row, int column, const QModelIndex& parent ) const override;
+    QModelIndex parent( const QModelIndex& index ) const override;
+    QVariant data( const QModelIndex& index, int role ) const override;
+    QVariant headerData( int section, Qt::Orientation orientation, int role ) const override;
+
+private:
+    const QVariant* const m_p;
+
+    /** @brief Tree representation of the variant.
+     *
+     * At index 0 in the vector , we store -1 to indicate the root.
+     *
+     * Then we enumerate all the elements in the tree (by traversing
+     * the variant and using QVariantMap and QVariantList as having
+     * children, and everything else being a leaf node) and at the index
+     * for a child, store the index of its parent. This means that direct
+     * children of the root store a 0 in their indexes, children of the first
+     * child of the root store a 1, and we can "pointer chase" from an index
+     * through parents back to index 0.
+     *
+     * Because of this structure, the value stored at index i must be
+     * less than i (except for index 0, which is special). This makes it
+     * slightly easier to search for a given value *p*, because we can start
+     * at index *p* (or even *p+1*).
+     *
+     * Given an index *i* into the vector corresponding to a child, we know the
+     * parent, but can also count which row this child should have, by counting
+     * *other* indexes before *i* with the same parent (and by the ordering
+     * of values, we can start counting at index *parent-index*).
+     *
+     */
+    IndexVector m_rows;
+
+    /// @brief Implementation of walking an index through the variant-tree
+    const QVariant underlying( const QModelIndex& index ) const;
+
+    /// @brief Helpers for range-checking
+    inline bool inRange( quintptr p ) const { return p < static_cast< quintptr >( m_rows.count() ); }
+    inline bool inRange( const QModelIndex& index ) const { return inRange( index.internalId() ); }
+};
+
+#endif

src/calamares/progresstree/ProgressTreeView.cpp

@@ -76,9 +76,10 @@ ProgressTreeView::setModel( QAbstractItemModel* model )
     QTreeView::setModel( model );
     expandAll();
 
-    connect( Calamares::ViewManager::instance(),
+    connect(
-             &Calamares::ViewManager::currentStepChanged,
+        Calamares::ViewManager::instance(),
-             this,
+        &Calamares::ViewManager::currentStepChanged,
-             [this]() { viewport()->update(); },
+        this,
-             Qt::UniqueConnection );
+        [this]() { viewport()->update(); },
+        Qt::UniqueConnection );
 }

src/libcalamares/GlobalStorage.h

@@ -22,6 +22,8 @@
 
 #include "CalamaresConfig.h"
 
+#include <QObject>
+#include <QString>
 #include <QVariantMap>
 
 #ifdef WITH_PYTHON
@@ -87,13 +89,19 @@ public:
     /// @brief reads settings from the given filename
     bool loadYaml( const QString& filename );
 
+    /** @brief Get internal mapping as a constant object
+     *
+     * Note that the VariantMap underneath may change, because
+     * it's not constant in itself. Connect to the changed()
+     * signal for notifications.
+     */
+    const QVariantMap& data() const { return m; }
+
 signals:
     void changed();
 
 private:
     QVariantMap m;
-
-    friend DebugWindow;
 };
 
 }  // namespace Calamares

src/libcalamares/utils/CalamaresUtilsSystem.cpp

@@ -236,8 +236,9 @@ System::runCommand( System::RunLocation location,
     }
     process.closeWriteChannel();
 
-    if ( !process.waitForFinished(
+    if ( !process.waitForFinished( timeoutSec > std::chrono::seconds::zero()
-             timeoutSec > std::chrono::seconds::zero() ? ( std::chrono::milliseconds( timeoutSec ).count() ) : -1 ) )
+                                       ? ( static_cast< int >( std::chrono::milliseconds( timeoutSec ).count() ) )
+                                       : -1 ) )
     {
         cWarning().noquote().nospace() << "Timed out. Output so far:\n" << process.readAllStandardOutput();
         return ProcessResult::Code::TimedOut;

src/libcalamares/utils/Tests.cpp

@@ -158,7 +158,7 @@ LibCalamaresTests::testUmask()
     mode_t m = CalamaresUtils::setUMask( 022 );
     QCOMPARE( CalamaresUtils::setUMask( m ), m );
 
-    for ( int i = 0; i <= 0777 /* octal! */; ++i )
+    for ( mode_t i = 0; i <= 0777 /* octal! */; ++i )
     {
         QByteArray name = ( ft.fileName() + QChar( '.' ) + QString::number( i, 8 ) ).toLatin1();
         CalamaresUtils::UMask um( i );

src/libcalamaresui/Branding.cpp

@@ -125,9 +125,9 @@ Branding::Branding( const QString& brandingFilePath,
                     QObject* parent )
     : QObject( parent )
     , m_descriptorPath( brandingFilePath )
+    , m_slideshowAPI( 1 )
     , m_welcomeStyleCalamares( false )
     , m_welcomeExpandingLogo( true )
-    , m_slideshowAPI( 1 )
 {
     cDebug() << "Using Calamares branding file at" << brandingFilePath;
 

src/libcalamaresui/CMakeLists.txt

@@ -14,13 +14,9 @@ set( calamaresui_SOURCES
     modulesystem/ViewModule.cpp
 
     utils/CalamaresUtilsGui.cpp
-    utils/DebugWindow.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
 
-    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
-    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
-
     viewpages/BlankViewStep.cpp
     viewpages/ViewStep.cpp
 
@@ -41,10 +37,6 @@ mark_thirdparty_code(
     ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 )
 
-set( calamaresui_UI
-    utils/DebugWindow.ui
-)
-
 if( WITH_PYTHON )
     list( APPEND calamaresui_SOURCES
         modulesystem/PythonJobModule.cpp
@@ -72,7 +64,6 @@ endif()
 
 calamares_add_library( calamaresui
     SOURCES ${calamaresui_SOURCES}
-    UI ${calamaresui_UI}
     EXPORT_MACRO UIDLLEXPORT_PRO
     LINK_PRIVATE_LIBRARIES
         ${OPTIONAL_PYTHON_LIBRARIES}

src/libcalamaresui/ViewManager.cpp

@@ -241,7 +241,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
     msgBox->show();
 
     cDebug() << "Calamares will quit when the dialog closes.";
-    connect( msgBox, &QMessageBox::buttonClicked, [this,msgBox]( QAbstractButton* button ) {
+    connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) {
         if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole )
         {
             // TODO: host and port should be configurable
@@ -254,9 +254,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
             }
 
             // TODO: make the URL clickable, or copy it to the clipboard automatically
-            QMessageBox::critical(nullptr,
+            QMessageBox::critical( nullptr, pasteUrlTitle, pasteUrlMsg );
-                                pasteUrlTitle,
-                                pasteUrlMsg);
         }
         QApplication::quit();
     } );

src/libcalamaresui/utils/ImageRegistry.cpp

@@ -2,6 +2,8 @@
  *
  *   SPDX-License-Identifier: GPLv3+
  *   License-Filename: LICENSES/GPLv3+-ImageRegistry
+ * 
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  */
 
 /*
@@ -23,25 +25,22 @@
 
 #include "ImageRegistry.h"
 
-#include <QSvgRenderer>
 #include <QPainter>
+#include <QSvgRenderer>
 #include <qicon.h>
 
 static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
-ImageRegistry* ImageRegistry::s_instance = 0;
 
 
 ImageRegistry*
 ImageRegistry::instance()
 {
+    static ImageRegistry* s_instance = new ImageRegistry();
     return s_instance;
 }
 
 
-ImageRegistry::ImageRegistry()
+ImageRegistry::ImageRegistry() {}
-{
-    s_instance = this;
-}
 
 
 QIcon
@@ -52,16 +51,20 @@ ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode )
 
 
 qint64
-ImageRegistry::cacheKey( const QSize& size, float opacity, QColor tint )
+ImageRegistry::cacheKey( const QSize& size, qreal opacity, QColor tint )
 {
-    return size.width() * 100 + size.height() * 10 + ( opacity * 100.0 ) + tint.value();
+    return size.width() * 100 + size.height() * 10 + static_cast< qint64 >( opacity * 100.0 ) + tint.value();
 }
 
 
 QPixmap
-ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, QColor tint )
+ImageRegistry::pixmap( const QString& image,
+                       const QSize& size,
+                       CalamaresUtils::ImageMode mode,
+                       qreal opacity,
+                       QColor tint )
 {
-    Q_ASSERT( !(size.width() < 0 || size.height() < 0) );
+    Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) );
     if ( size.width() < 0 || size.height() < 0 )
     {
         return QPixmap();
@@ -110,23 +113,20 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
 
             resultImage.setAlphaChannel( p.toImage().alphaChannel() );
             p = QPixmap::fromImage( resultImage );
-       }
+        }
 
         pixmap = p;
     }
     else
+    {
         pixmap = QPixmap( image );
+    }
 
     if ( !pixmap.isNull() )
     {
-        switch ( mode )
+        if ( mode == CalamaresUtils::RoundedCorners )
         {
-            case CalamaresUtils::RoundedCorners:
+            pixmap = CalamaresUtils::createRoundedImage( pixmap, size );
-                pixmap = CalamaresUtils::createRoundedImage( pixmap, size );
-                break;
-
-            default:
-                break;
         }
 
         if ( !size.isNull() && pixmap.size() != size )
@@ -140,7 +140,9 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
                 pixmap = pixmap.scaledToWidth( size.width(), Qt::SmoothTransformation );
             }
             else
+            {
                 pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+            }
         }
 
         putInCache( image, size, mode, opacity, pixmap, tint );
@@ -151,7 +153,12 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
 
 
 void
-ImageRegistry::putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, const QPixmap& pixmap, QColor tint )
+ImageRegistry::putInCache( const QString& image,
+                           const QSize& size,
+                           CalamaresUtils::ImageMode mode,
+                           qreal opacity,
+                           const QPixmap& pixmap,
+                           QColor tint )
 {
     QHash< qint64, QPixmap > subsubcache;
     QHash< int, QHash< qint64, QPixmap > > subcache;

src/libcalamaresui/utils/ImageRegistry.h

@@ -2,6 +2,8 @@
  *
  *   SPDX-License-Identifier: GPLv3+
  *   License-Filename: LICENSES/GPLv3+-ImageRegistry
+ * 
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  */
 
 /*
@@ -26,8 +28,8 @@
 
 #include <QPixmap>
 
-#include "utils/CalamaresUtilsGui.h"
 #include "UiDllMacro.h"
+#include "utils/CalamaresUtilsGui.h"
 
 class UIDLLEXPORT ImageRegistry
 {
@@ -37,13 +39,20 @@ public:
     explicit ImageRegistry();
 
     QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
-    QPixmap pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode = CalamaresUtils::Original, float opacity = 1.0, QColor tint = QColor( 0, 0, 0, 0 ) );
+    QPixmap pixmap( const QString& image,
+                    const QSize& size,
+                    CalamaresUtils::ImageMode mode = CalamaresUtils::Original,
+                    qreal opacity = 1.0,
+                    QColor tint = QColor( 0, 0, 0, 0 ) );
 
 private:
-    qint64 cacheKey( const QSize& size, float opacity, QColor tint );
+    qint64 cacheKey( const QSize& size, qreal opacity, QColor tint );
-    void putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, const QPixmap& pixmap, QColor tint );
+    void putInCache( const QString& image,
-
+                     const QSize& size,
-    static ImageRegistry* s_instance;
+                     CalamaresUtils::ImageMode mode,
+                     qreal opacity,
+                     const QPixmap& pixmap,
+                     QColor tint );
 };
 
-#endif // IMAGE_REGISTRY_H
+#endif  // IMAGE_REGISTRY_H

src/libcalamaresui/utils/Paste.cpp

@@ -29,7 +29,7 @@ namespace CalamaresUtils
 {
 
 QString
-sendLogToPastebin( QObject* parent, const QString& ficheHost, int fichePort )
+sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort )
 {
     QString pasteUrlFmt = parent->tr( "Install log posted to:\n%1" );
     QFile pasteSourceFile( Logger::logFile() );

src/libcalamaresui/utils/Paste.h

@@ -19,6 +19,8 @@
 #ifndef UTILS_PASTE_H
 #define UTILS_PASTE_H
 
+#include <qglobal.h>  // for quint16
+
 class QObject;
 class QString;
 
@@ -29,7 +31,7 @@ namespace CalamaresUtils
  *
  * Returns the (string) URL that the pastebin gives us.
  */
-QString sendLogToPastebin( QObject* parent, const QString& ficheHost, int fichePort );
+QString sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort );
 
 }  // namespace CalamaresUtils
 

src/modules/dummycpp/DummyCppJob.cpp

@@ -20,13 +20,13 @@
 
 #include "DummyCppJob.h"
 
-#include <QProcess>
 #include <QDateTime>
+#include <QProcess>
 #include <QThread>
 
 #include "CalamaresVersion.h"
-#include "JobQueue.h"
 #include "GlobalStorage.h"
+#include "JobQueue.h"
 
 #include "utils/Logger.h"
 
@@ -36,9 +36,7 @@ DummyCppJob::DummyCppJob( QObject* parent )
 }
 
 
-DummyCppJob::~DummyCppJob()
+DummyCppJob::~DummyCppJob() {}
-{
-}
 
 
 QString
@@ -56,19 +54,20 @@ static QString variantHashToString( const QVariantHash& variantHash );
 static QString
 variantToString( const QVariant& variant )
 {
-    switch ( variant.type() )
+    if ( variant.type() == QVariant::Map )
     {
-    case QVariant::Map:
         return variantMapToString( variant.toMap() );
-
+    }
-    case QVariant::Hash:
+    else if ( variant.type() == QVariant::Hash )
+    {
         return variantHashToString( variant.toHash() );
-
+    }
-    case QVariant::List:
+    else if ( ( variant.type() == QVariant::List ) || ( variant.type() == QVariant::StringList ) )
-    case QVariant::StringList:
+    {
         return variantListToString( variant.toList() );
-
+    }
-    default:
+    else
+    {
         return variant.toString();
     }
 }
@@ -79,8 +78,10 @@ variantListToString( const QVariantList& variantList )
 {
     QStringList result;
     for ( const QVariant& variant : variantList )
+    {
         result.append( variantToString( variant ) );
-    return '{' + result.join(',') + '}';
+    }
+    return '{' + result.join( ',' ) + '}';
 }
 
 
@@ -89,8 +90,10 @@ variantMapToString( const QVariantMap& variantMap )
 {
     QStringList result;
     for ( auto it = variantMap.constBegin(); it != variantMap.constEnd(); ++it )
+    {
         result.append( it.key() + '=' + variantToString( it.value() ) );
-    return '[' + result.join(',') + ']';
+    }
+    return '[' + result.join( ',' ) + ']';
 }
 
 
@@ -99,8 +102,10 @@ variantHashToString( const QVariantHash& variantHash )
 {
     QStringList result;
     for ( auto it = variantHash.constBegin(); it != variantHash.constEnd(); ++it )
+    {
         result.append( it.key() + '=' + variantToString( it.value() ) );
-    return '<' + result.join(',') + '>';
+    }
+    return '<' + result.join( ',' ) + '>';
 }
 
 
@@ -108,24 +113,28 @@ Calamares::JobResult
 DummyCppJob::exec()
 {
     // Ported from dummypython
-    QProcess::execute( "/bin/sh", QStringList() << "-c" << "touch ~/calamares-dummycpp" );
+    QProcess::execute( "/bin/sh",
+                       QStringList() << "-c"
+                                     << "touch ~/calamares-dummycpp" );
     QString accumulator = QDateTime::currentDateTimeUtc().toString( Qt::ISODate ) + '\n';
     accumulator += QStringLiteral( "Calamares version: " ) + CALAMARES_VERSION_SHORT + '\n';
     accumulator += QStringLiteral( "This job's name: " ) + prettyName() + '\n';
     accumulator += QStringLiteral( "Configuration map: %1\n" ).arg( variantMapToString( m_configurationMap ) );
     accumulator += QStringLiteral( "   *** globalstorage test ***\n" );
-    Calamares::GlobalStorage *globalStorage = Calamares::JobQueue::instance()->globalStorage();
+    Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage();
-    accumulator += QStringLiteral( "lala: " ) + (globalStorage->contains( "lala" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" )) + '\n';
+    accumulator += QStringLiteral( "lala: " )
-    accumulator += QStringLiteral( "foo: " ) + (globalStorage->contains( "foo" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" )) + '\n';
+        + ( globalStorage->contains( "lala" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" ) ) + '\n';
+    accumulator += QStringLiteral( "foo: " )
+        + ( globalStorage->contains( "foo" ) ? QStringLiteral( "true" ) : QStringLiteral( "false" ) ) + '\n';
     accumulator += QStringLiteral( "count: " ) + QString::number( globalStorage->count() ) + '\n';
     globalStorage->insert( "item2", "value2" );
     globalStorage->insert( "item3", 3 );
     accumulator += QStringLiteral( "keys: %1\n" ).arg( globalStorage->keys().join( ',' ) );
     accumulator += QStringLiteral( "remove: %1\n" ).arg( QString::number( globalStorage->remove( "item2" ) ) );
-    accumulator += QStringLiteral( "values: %1 %2 %3\n" ).arg(
+    accumulator += QStringLiteral( "values: %1 %2 %3\n" )
-        globalStorage->value( "foo" ).toString(),
+                       .arg( globalStorage->value( "foo" ).toString(),
-        globalStorage->value( "item2" ).toString(),
+                             globalStorage->value( "item2" ).toString(),
-        globalStorage->value( "item3" ).toString() );
+                             globalStorage->value( "item3" ).toString() );
 
     emit progress( 0.1 );
     cDebug() << "[DUMMYCPP]: " << accumulator;
@@ -145,4 +154,4 @@ DummyCppJob::setConfigurationMap( const QVariantMap& configurationMap )
     m_configurationMap = configurationMap;
 }
 
-CALAMARES_PLUGIN_FACTORY_DEFINITION( DummyCppJobFactory, registerPlugin<DummyCppJob>(); )
+CALAMARES_PLUGIN_FACTORY_DEFINITION( DummyCppJobFactory, registerPlugin< DummyCppJob >(); )

src/modules/dummycpp/DummyCppJob.h

@@ -49,4 +49,4 @@ private:
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( DummyCppJobFactory )
 
-#endif // DUMMYCPPJOB_H
+#endif  // DUMMYCPPJOB_H

src/modules/initcpio/CMakeLists.txt

@@ -21,6 +21,5 @@ if( ECM_FOUND AND BUILD_TESTING )
             Qt5::Core
             Qt5::Test
     )
-    set_target_properties( initcpiotest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( initcpiotest )
-    target_include_directories( initcpiotest PRIVATE /usr/local/include )
 endif()

src/modules/initramfs/CMakeLists.txt

@@ -21,6 +21,5 @@ if( ECM_FOUND AND BUILD_TESTING )
             Qt5::Core
             Qt5::Test
     )
-    set_target_properties( initramfstest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( initramfstest )
-    target_include_directories( initramfstest PRIVATE /usr/local/include )
 endif()