REUSE: (GPL-3.0-or-later) C++ modules

src/modules/README.md

@@ -1,5 +1,10 @@
 # Calamares modules
 
+<!-- SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+     SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+     SPDX-License-Identifier: GPL-3.0-or-later
+-->
+
 Calamares modules are plugins that provide features like installer pages,
 batch jobs, etc. An installer page (visible to the user) is called a "view",
 while other modules are "jobs".

src/modules/contextualprocess/Binding.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2017-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/contextualprocess/ContextualProcessJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2017-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/contextualprocess/ContextualProcessJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/contextualprocess/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/contextualprocess/Tests.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/dracutlukscfg/DracutLuksCfgJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2016 Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/dracutlukscfg/DracutLuksCfgJob.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2016 Kevin Kofler <kevin.kofler@chello.at>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/dummycpp/DummyCppJob.cpp

@@ -1,8 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org> (original dummypython code)
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org> (original dummypython code)
- *   Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2016 Kevin Kofler <kevin.kofler@chello.at>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/dummycpp/DummyCppJob.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2016 Kevin Kofler <kevin.kofler@chello.at>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/finished/FinishedPage.cpp

@@ -1,8 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
- *   Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
+ *   SPDX-FileCopyrightText: 2019 Collabora Ltd <arnaud.ferraris@collabora.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/finished/FinishedPage.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/finished/FinishedViewStep.cpp

@@ -1,8 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot <groot@kde.org>
- *   Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
+ *   SPDX-FileCopyrightText: 2019 Collabora Ltd <arnaud.ferraris@collabora.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/finished/FinishedViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/fsresizer/ResizeFSJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,8 +27,8 @@
 #include "utils/Units.h"
 #include "utils/Variant.h"
 
-#include <QProcess>
 #include <QDateTime>
+#include <QProcess>
 #include <QThread>
 
 #include <kpmcore/backend/corebackend.h>
@@ -46,9 +47,7 @@ ResizeFSJob::ResizeFSJob( QObject* parent )
 }
 
 
-ResizeFSJob::~ResizeFSJob()
+ResizeFSJob::~ResizeFSJob() {}
-{
-}
 
 
 QString
@@ -62,7 +61,8 @@ ResizeFSJob::findPartition()
 {
     using DeviceList = QList< Device* >;
 #if defined( WITH_KPMCORE4API )
-    DeviceList devices = m_kpmcore.backend()->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) );
+    DeviceList devices
+        = m_kpmcore.backend()->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
 #else
     DeviceList devices = m_kpmcore.backend()->scanDevices( /* excludeReadOnly */ true );
 #endif
@@ -71,13 +71,16 @@ ResizeFSJob::findPartition()
     for ( DeviceList::iterator dev_it = devices.begin(); dev_it != devices.end(); ++dev_it )
     {
         if ( !( *dev_it ) )
+        {
             continue;
+        }
         cDebug() << "ResizeFSJob found" << ( *dev_it )->deviceNode();
-        for ( auto part_it = PartitionIterator::begin( *dev_it ); part_it != PartitionIterator::end( *dev_it ); ++part_it )
+        for ( auto part_it = PartitionIterator::begin( *dev_it ); part_it != PartitionIterator::end( *dev_it );
+              ++part_it )
         {
             cDebug() << Logger::SubEntry << ( *part_it )->mountPoint() << "on" << ( *part_it )->deviceNode();
-            if ( ( !m_fsname.isEmpty() && ( *part_it )->mountPoint() == m_fsname ) ||
+            if ( ( !m_fsname.isEmpty() && ( *part_it )->mountPoint() == m_fsname )
-                    ( !m_devicename.isEmpty() && ( *part_it )->deviceNode() == m_devicename ) )
+                 || ( !m_devicename.isEmpty() && ( *part_it )->deviceNode() == m_devicename ) )
             {
                 cDebug() << Logger::SubEntry << "matched configuration dev=" << m_devicename << "fs=" << m_fsname;
                 return PartitionMatch( *dev_it, *part_it );
@@ -101,11 +104,17 @@ qint64
 ResizeFSJob::findGrownEnd( ResizeFSJob::PartitionMatch m )
 {
     if ( !m.first || !m.second )
+    {
         return -1;  // Missing device data
+    }
     if ( !ResizeOperation::canGrow( m.second ) )
+    {
         return -1;  // Operation is doomed
+    }
     if ( !m_size.isValid() )
+    {
         return -1;  // Must have a grow-size
+    }
 
     cDebug() << "Containing device size" << m.first->totalLogical();
     qint64 last_available = m.first->totalLogical() - 1;  // Numbered from 0
@@ -173,8 +182,7 @@ ResizeFSJob::exec()
     if ( !m_kpmcore )
     {
         cWarning() << "Could not load KPMCore backend (2).";
-        return Calamares::JobResult::error(
+        return Calamares::JobResult::error( tr( "KPMCore not Available" ),
-            tr( "KPMCore not Available" ),
                                             tr( "Calamares cannot start KPMCore for the file-system resize job." ) );
     }
     m_kpmcore.backend()->initFSSupport();  // Might not be enough, see below
@@ -184,34 +192,32 @@ ResizeFSJob::exec()
     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 )
+            !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 ) )
     {
         cDebug() << "canGrow() returned false.";
-        return Calamares::JobResult::error(
+        return Calamares::JobResult::error( tr( "Resize Failed" ),
-            tr( "Resize Failed" ),
+                                            !m_fsname.isEmpty()
-            !m_fsname.isEmpty() ? tr( "The filesystem %1 cannot be resized." ).arg( m_fsname )
+                                                ? tr( "The filesystem %1 cannot be resized." ).arg( m_fsname )
                                                 : tr( "The device %1 cannot be resized." ).arg( m_devicename ) );
     }
 
     qint64 new_end = findGrownEnd( m );
-    cDebug() << "Resize from"
+    cDebug() << "Resize from" << m.second->firstSector() << '-' << m.second->lastSector() << '(' << m.second->length()
-             << m.second->firstSector() << '-' << m.second->lastSector()
+             << ')' << "to -" << new_end;
-             << '(' << m.second->length() << ')'
-             << "to -" << new_end;
 
     if ( new_end < 0 )
-        return Calamares::JobResult::error(
+        return Calamares::JobResult::error( tr( "Resize Failed" ),
-            tr( "Resize Failed" ),
+                                            !m_fsname.isEmpty()
-            !m_fsname.isEmpty() ? tr( "The filesystem %1 cannot be resized." ).arg( m_fsname )
+                                                ? 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
+        cWarning() << "Resize operation on" << m_fsname << m_devicename << "skipped as not-useful.";
-                   << "skipped as not-useful.";
         if ( m_required )
             return Calamares::JobResult::error(
                 tr( "Resize Failed" ),
@@ -226,13 +232,13 @@ ResizeFSJob::exec()
         ResizeOperation op( *m.first, *m.second, m.second->firstSector(), new_end );
         Report op_report( nullptr );
         if ( op.execute( op_report ) )
+        {
             cDebug() << "Resize operation OK.";
+        }
         else
         {
             cDebug() << "Resize failed." << op_report.output();
-            return Calamares::JobResult::error(
+            return Calamares::JobResult::error( tr( "Resize Failed" ), op_report.toText() );
-                       tr( "Resize Failed" ),
-                       op_report.toText() );
         }
     }
 

src/modules/fsresizer/ResizeFSJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -51,26 +52,13 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
     /** @brief Is the configuration of this job valid? */
-    bool isValid() const
+    bool isValid() const { return ( !m_fsname.isEmpty() || !m_devicename.isEmpty() ) && m_size.isValid(); }
-    {
-        return ( !m_fsname.isEmpty() || !m_devicename.isEmpty() ) &&
-               m_size.isValid();
-    }
 
-    QString name() const
+    QString name() const { return m_fsname.isEmpty() ? m_devicename : m_fsname; }
-    {
-        return m_fsname.isEmpty() ? m_devicename : m_fsname;
-    }
 
-    PartitionSize size() const
+    PartitionSize size() const { return m_size; }
-    {
-        return m_size;
-    }
 
-    PartitionSize minimumSize() const
+    PartitionSize minimumSize() const { return m_atleast; }
-    {
-        return m_atleast;
-    }
 
 private:
     CalamaresUtils::Partition::KPMManager m_kpmcore;

src/modules/fsresizer/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -36,20 +37,17 @@ using SizeUnit = CalamaresUtils::Partition::SizeUnit;
 
 QTEST_GUILESS_MAIN( FSResizerTests )
 
-FSResizerTests::FSResizerTests()
+FSResizerTests::FSResizerTests() {}
-{
-}
 
-FSResizerTests::~FSResizerTests()
+FSResizerTests::~FSResizerTests() {}
-{
-}
 
 void
 FSResizerTests::initTestCase()
 {
 }
 
-void FSResizerTests::testConfigurationRobust()
+void
+FSResizerTests::testConfigurationRobust()
 {
     ResizeFSJob j;
 
@@ -72,7 +70,8 @@ atleast: 600MiB
     QCOMPARE( j.minimumSize().value(), 0 );
 }
 
-void FSResizerTests::testConfigurationValues()
+void
+FSResizerTests::testConfigurationValues()
 {
     ResizeFSJob j;
 

src/modules/fsresizer/Tests.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/hostinfo/HostInfoJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/hostinfo/HostInfoJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/hostinfo/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/initcpio/InitcpioJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -88,8 +89,11 @@ InitcpioJob::setConfigurationMap( const QVariantMap& configurationMap )
     }
     else if ( m_kernel == "$uname" )
     {
-        auto r = CalamaresUtils::System::runCommand(
+        auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
-            CalamaresUtils::System::RunLocation::RunInHost, { "/bin/uname", "-r" }, QString(), QString(), std::chrono::seconds( 3 ) );
+                                                     { "/bin/uname", "-r" },
+                                                     QString(),
+                                                     QString(),
+                                                     std::chrono::seconds( 3 ) );
         if ( r.getExitCode() == 0 )
         {
             m_kernel = r.getOutput();

src/modules/initcpio/InitcpioJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/initcpio/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -34,20 +35,17 @@ extern void fixPermissions( const QDir& d );
 
 QTEST_GUILESS_MAIN( InitcpioTests )
 
-InitcpioTests::InitcpioTests()
+InitcpioTests::InitcpioTests() {}
-{
-}
 
-InitcpioTests::~InitcpioTests()
+InitcpioTests::~InitcpioTests() {}
-{
-}
 
 void
 InitcpioTests::initTestCase()
 {
 }
 
-void InitcpioTests::testFixPermissions()
+void
+InitcpioTests::testFixPermissions()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
     cDebug() << "Fixing up /boot";
@@ -56,4 +54,3 @@ void InitcpioTests::testFixPermissions()
     fixPermissions( QDir( "/nonexistent/nonexistent" ) );
     QVERIFY( true );
 }
-

src/modules/initcpio/Tests.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/initramfs/InitramfsJob.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -78,8 +79,11 @@ InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap )
     }
     else if ( m_kernel == "$uname" )
     {
-        auto r = CalamaresUtils::System::runCommand(
+        auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
-            CalamaresUtils::System::RunLocation::RunInHost, { "/bin/uname", "-r" }, QString(), QString(), std::chrono::seconds( 3 ) );
+                                                     { "/bin/uname", "-r" },
+                                                     QString(),
+                                                     QString(),
+                                                     std::chrono::seconds( 3 ) );
         if ( r.getExitCode() == 0 )
         {
             m_kernel = r.getOutput();

src/modules/initramfs/InitramfsJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/initramfs/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -33,13 +34,9 @@
 
 QTEST_GUILESS_MAIN( InitramfsTests )
 
-InitramfsTests::InitramfsTests()
+InitramfsTests::InitramfsTests() {}
-{
-}
 
-InitramfsTests::~InitramfsTests()
+InitramfsTests::~InitramfsTests() {}
-{
-}
 
 void
 InitramfsTests::initTestCase()
@@ -53,12 +50,14 @@ InitramfsTests::initTestCase()
 static const char contents[] = "UMASK=0077\n";
 static const char confFile[] = "/tmp/calamares-safe-umask";
 
-void InitramfsTests::cleanup()
+void
+InitramfsTests::cleanup()
 {
     QFile::remove( confFile );
 }
 
-void InitramfsTests::testCreateTargetFile()
+void
+InitramfsTests::testCreateTargetFile()
 {
     static const char short_confFile[] = "/calamares-safe-umask";
 
@@ -82,5 +81,4 @@ void InitramfsTests::testCreateTargetFile()
     QCOMPARE( ulong( fi.size() ), sizeof( contents ) - 1 );  // don't count trailing NUL
 
     QFile::remove( path );
-
 }

src/modules/initramfs/Tests.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/initramfscfg/encrypt_hook

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# SPDX-FileCopyrightText: 2016 David McKinney <mckinney@subgraph.com>
+# SPDX-License-Identifier: GPL-3.0-or-later
 
   PREREQ=""
 

src/modules/initramfscfg/encrypt_hook_nokey

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# SPDX-FileCopyrightText: 2016 David McKinney <mckinney@subgraph.com>
+# SPDX-License-Identifier: GPL-3.0-or-later
 
   PREREQ=""
 

src/modules/interactiveterminal/InteractiveTerminalPage.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -18,14 +19,14 @@
 
 #include "InteractiveTerminalPage.h"
 
-#include "viewpages/ViewStep.h"
-#include "utils/Retranslator.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/Retranslator.h"
+#include "viewpages/ViewStep.h"
 
-#include <KService>
-#include <KParts/kde_terminal_interface.h>
 #include <KParts/ReadOnlyPart>
+#include <KParts/kde_terminal_interface.h>
+#include <KService>
 
 #include <QApplication>
 #include <QDir>
@@ -49,17 +50,17 @@ InteractiveTerminalPage::InteractiveTerminalPage( QWidget* parent )
 void
 InteractiveTerminalPage::errorKonsoleNotInstalled()
 {
-    QMessageBox::critical( this,
+    QMessageBox::critical(
-                           tr( "Konsole not installed"),
+        this, tr( "Konsole not installed" ), tr( "Please install KDE Konsole and try again!" ), QMessageBox::Ok );
-                           tr( "Please install KDE Konsole and try again!" ),
-                           QMessageBox::Ok );
 }
 
 void
 InteractiveTerminalPage::onActivate()
 {
     if ( m_termHostWidget )
+    {
         return;
+    }
     // For whatever reason, instead of simply linking against a library we
     // need to do a runtime query to KService just to get a sodding terminal
     // widget.
@@ -73,10 +74,7 @@ InteractiveTerminalPage::onActivate()
     }
 
     // Create one instance of konsolepart.
-    KParts::ReadOnlyPart* p =
+    KParts::ReadOnlyPart* p = service->createInstance< KParts::ReadOnlyPart >( this, this, {} );
-        service->createInstance< KParts::ReadOnlyPart >( this,
-                                                         this,
-                                                         {} );
     if ( !p )
     {
         // One more opportunity for the loading operation to fail.
@@ -100,8 +98,7 @@ InteractiveTerminalPage::onActivate()
 
     m_termHostWidget = p->widget();
     m_layout->addWidget( m_termHostWidget );
-    cDebug() << "Part widget ought to be"
+    cDebug() << "Part widget ought to be" << m_termHostWidget->metaObject()->className();
-             << m_termHostWidget->metaObject()->className();
 
     t->showShellInDir( QDir::home().path() );
     t->sendInput( QString( "%1\n" ).arg( m_command ) );
@@ -112,8 +109,5 @@ void
 InteractiveTerminalPage::setCommand( const QString& command )
 {
     m_command = command;
-    CALAMARES_RETRANSLATE(
+    CALAMARES_RETRANSLATE( m_headerLabel->setText( tr( "Executing script: &nbsp;<code>%1</code>" ).arg( m_command ) ); )
-        m_headerLabel->setText( tr( "Executing script: &nbsp;<code>%1</code>" )
-                                .arg( m_command ) );
-    )
 }

src/modules/interactiveterminal/InteractiveTerminalPage.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,7 +25,8 @@
 
 #include <QVariant>
 
-CALAMARES_PLUGIN_FACTORY_DEFINITION( InteractiveTerminalViewStepFactory, registerPlugin<InteractiveTerminalViewStep>(); )
+CALAMARES_PLUGIN_FACTORY_DEFINITION( InteractiveTerminalViewStepFactory,
+                                     registerPlugin< InteractiveTerminalViewStep >(); )
 
 InteractiveTerminalViewStep::InteractiveTerminalViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
@@ -37,8 +39,10 @@ InteractiveTerminalViewStep::InteractiveTerminalViewStep( QObject* parent )
 InteractiveTerminalViewStep::~InteractiveTerminalViewStep()
 {
     if ( m_widget && m_widget->parent() == nullptr )
+    {
         m_widget->deleteLater();
     }
+}
 
 
 QString
@@ -102,8 +106,8 @@ InteractiveTerminalViewStep::onActivate()
 void
 InteractiveTerminalViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    if ( configurationMap.contains( "command" ) &&
+    if ( configurationMap.contains( "command" ) && configurationMap.value( "command" ).type() == QVariant::String )
-         configurationMap.value( "command").type() == QVariant::String )
+    {
         m_widget->setCommand( configurationMap.value( "command" ).toString() );
     }
-
+}

src/modules/interactiveterminal/InteractiveTerminalViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/Config.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot <groot@kde.org>
- *   Copyright 2020, Camilo Higuita <milo.h@aol.com> *
+ *   SPDX-FileCopyrightText: 2020 Camilo Higuita <milo.h@aol.com> *
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/Config.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot <groot@kde.org>
- *   Copyright 2020, Camilo Higuita <milo.h@aol.com>
+ *   SPDX-FileCopyrightText: 2020 Camilo Higuita <milo.h@aol.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/KeyboardLayoutModel.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/KeyboardLayoutModel.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/KeyboardPage.cpp

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>

src/modules/keyboard/KeyboardPage.h

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>

src/modules/keyboard/KeyboardViewStep.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/KeyboardViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/README.md

@@ -1,5 +0,0 @@
-Keyboard layout configuration viewmodule
----
-Requires ckbcomp script.
- * Debian package console-setup or
- * Manjaro package keyboardctl https://github.com/manjaro/packages-core/tree/master/keyboardctl

src/modules/keyboard/SetKeyboardLayoutJob.cpp

@@ -1,7 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2011 Lennart Poettering
- *   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: Kay Sievers
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Portions from systemd (localed.c):
  *   Copyright 2011 Lennart Poettering

src/modules/keyboard/SetKeyboardLayoutJob.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2014 Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboard/images/restore.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/keyboard/kbd-model-map

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2015 Systemd authors and contributors
+# SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
 # Copied from systemd-localed
 #
 # https://cgit.freedesktop.org/systemd/systemd/log/src/locale/kbd-model-map

src/modules/keyboard/keyboardwidget/keyboardglobal.cpp

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -43,18 +45,22 @@ static const char XKB_FILE[] = "/usr/share/X11/xkb/rules/base.lst";
  * or hits end-of-file. Returns true if the section is found. The
  * @p name must include the "! " section marker as well.
  */
-static bool findSection( QFile& fh, const char* name )
+static bool
+findSection( QFile& fh, const char* name )
 {
     while ( !fh.atEnd() )
     {
         QByteArray line = fh.readLine();
         if ( line.startsWith( name ) )
+        {
             return true;
         }
+    }
     return false;
 }
 
-static KeyboardGlobal::ModelsMap parseKeyboardModels( const char* filepath )
+static KeyboardGlobal::ModelsMap
+parseKeyboardModels( const char* filepath )
 {
     KeyboardGlobal::ModelsMap models;
 
@@ -75,7 +81,9 @@ static KeyboardGlobal::ModelsMap parseKeyboardModels( const char* filepath )
 
         // check if we start a new section
         if ( line.startsWith( '!' ) )
+        {
             break;
+        }
 
         // here we are in the model section, otherwhise we would continue or break
         QRegExp rx;
@@ -88,7 +96,9 @@ static KeyboardGlobal::ModelsMap parseKeyboardModels( const char* filepath )
             QString model = rx.cap( 1 );
 
             if ( model == "pc105" )
+            {
                 modelDesc += "  -  " + QObject::tr( "Default Keyboard Model" );
+            }
 
             models.insert( modelDesc, model );
         }
@@ -98,7 +108,8 @@ static KeyboardGlobal::ModelsMap parseKeyboardModels( const char* filepath )
 }
 
 
-KeyboardGlobal::LayoutsMap parseKeyboardLayouts( const char* filepath )
+KeyboardGlobal::LayoutsMap
+parseKeyboardLayouts( const char* filepath )
 {
     KeyboardGlobal::LayoutsMap layouts;
 
@@ -120,7 +131,9 @@ KeyboardGlobal::LayoutsMap parseKeyboardLayouts( const char* filepath )
         QByteArray line = fh.readLine();
 
         if ( line.startsWith( '!' ) )
+        {
             break;
+        }
 
         QRegExp rx;
         rx.setPattern( "^\\s+(\\S+)\\s+(\\w.*)\n$" );
@@ -147,7 +160,9 @@ KeyboardGlobal::LayoutsMap parseKeyboardLayouts( const char* filepath )
         QByteArray line = fh.readLine();
 
         if ( line.startsWith( '!' ) )
+        {
             break;
+        }
 
         QRegExp rx;
         rx.setPattern( "^\\s+(\\S+)\\s+(\\S+): (\\w.*)\n$" );
@@ -176,14 +191,15 @@ KeyboardGlobal::LayoutsMap parseKeyboardLayouts( const char* filepath )
 }
 
 
-KeyboardGlobal::LayoutsMap KeyboardGlobal::getKeyboardLayouts()
+KeyboardGlobal::LayoutsMap
+KeyboardGlobal::getKeyboardLayouts()
 {
     return parseKeyboardLayouts( XKB_FILE );
 }
 
 
-KeyboardGlobal::ModelsMap KeyboardGlobal::getKeyboardModels()
+KeyboardGlobal::ModelsMap
+KeyboardGlobal::getKeyboardModels()
 {
     return parseKeyboardModels( XKB_FILE );
 }
-

src/modules/keyboard/keyboardwidget/keyboardglobal.h

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -24,21 +26,22 @@
 #ifndef KEYBOARDGLOBAL_H
 #define KEYBOARDGLOBAL_H
 
-#include <QString>
+#include <QDebug>
-#include <QFile>
-#include <QTextStream>
 #include <QDir>
-#include <QStringList>
+#include <QFile>
-#include <QList>
 #include <QHash>
+#include <QList>
 #include <QMap>
 #include <QRegExp>
-#include <QDebug>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
 class KeyboardGlobal
 {
 public:
-    struct KeyboardInfo {
+    struct KeyboardInfo
+    {
         QString description;
         QMap< QString, QString > variants;
     };

src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -43,78 +45,108 @@ KeyBoardPreview::KeyBoardPreview( QWidget* parent )
 
     // Setup keyboard types
     kbList[ KB_104 ].kb_extended_return = false;
-    kbList[KB_104].keys.append(QList<int>() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa << 0xb << 0xc << 0xd);
+    kbList[ KB_104 ].keys.append( QList< int >() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa
-    kbList[KB_104].keys.append(QList<int>() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18 << 0x19 << 0x1a << 0x1b << 0x2b);
+                                                 << 0xb << 0xc << 0xd );
-    kbList[KB_104].keys.append(QList<int>() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26 << 0x27 << 0x28);
+    kbList[ KB_104 ].keys.append( QList< int >() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18
-    kbList[KB_104].keys.append(QList<int>() << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33 << 0x34 << 0x35);
+                                                 << 0x19 << 0x1a << 0x1b << 0x2b );
+    kbList[ KB_104 ].keys.append( QList< int >() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26
+                                                 << 0x27 << 0x28 );
+    kbList[ KB_104 ].keys.append( QList< int >()
+                                  << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33 << 0x34 << 0x35 );
 
     kbList[ KB_105 ].kb_extended_return = true;
-    kbList[KB_105].keys.append(QList<int>() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa << 0xb << 0xc << 0xd);
+    kbList[ KB_105 ].keys.append( QList< int >() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa
-    kbList[KB_105].keys.append(QList<int>() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18 << 0x19 << 0x1a << 0x1b);
+                                                 << 0xb << 0xc << 0xd );
-    kbList[KB_105].keys.append(QList<int>() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26 << 0x27 << 0x28 << 0x2b);
+    kbList[ KB_105 ].keys.append( QList< int >() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18
-    kbList[KB_105].keys.append(QList<int>() << 0x54 << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33 << 0x34 << 0x35);
+                                                 << 0x19 << 0x1a << 0x1b );
+    kbList[ KB_105 ].keys.append( QList< int >() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26
+                                                 << 0x27 << 0x28 << 0x2b );
+    kbList[ KB_105 ].keys.append( QList< int >() << 0x54 << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33
+                                                 << 0x34 << 0x35 );
 
     kbList[ KB_106 ].kb_extended_return = true;
-    kbList[KB_106].keys.append(QList<int>() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa << 0xb << 0xc << 0xd << 0xe);
+    kbList[ KB_106 ].keys.append( QList< int >() << 0x29 << 0x2 << 0x3 << 0x4 << 0x5 << 0x6 << 0x7 << 0x8 << 0x9 << 0xa
-    kbList[KB_106].keys.append(QList<int>() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18 << 0x19 << 0x1a << 0x1b);
+                                                 << 0xb << 0xc << 0xd << 0xe );
-    kbList[KB_106].keys.append(QList<int>() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26 << 0x27 << 0x28 << 0x29);
+    kbList[ KB_106 ].keys.append( QList< int >() << 0x10 << 0x11 << 0x12 << 0x13 << 0x14 << 0x15 << 0x16 << 0x17 << 0x18
-    kbList[KB_106].keys.append(QList<int>() << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33 << 0x34 << 0x35 << 0x36);
+                                                 << 0x19 << 0x1a << 0x1b );
+    kbList[ KB_106 ].keys.append( QList< int >() << 0x1e << 0x1f << 0x20 << 0x21 << 0x22 << 0x23 << 0x24 << 0x25 << 0x26
+                                                 << 0x27 << 0x28 << 0x29 );
+    kbList[ KB_106 ].keys.append( QList< int >() << 0x2c << 0x2d << 0x2e << 0x2f << 0x30 << 0x31 << 0x32 << 0x33 << 0x34
+                                                 << 0x35 << 0x36 );
 
     kb = &kbList[ KB_104 ];
 }
 
 
-
+void
-void KeyBoardPreview::setLayout(QString _layout) {
+KeyBoardPreview::setLayout( QString _layout )
+{
     layout = _layout;
 }
 
 
-
+void
-void KeyBoardPreview::setVariant(QString _variant) {
+KeyBoardPreview::setVariant( QString _variant )
+{
     variant = _variant;
 
     if ( !loadCodes() )
+    {
         return;
+    }
 
     loadInfo();
     repaint();
 }
 
 
-
 //###
 //### Private
 //###
 
 
-
+void
-void KeyBoardPreview::loadInfo() {
+KeyBoardPreview::loadInfo()
+{
     // kb_104
     if ( layout == "us" || layout == "th" )
+    {
         kb = &kbList[ KB_104 ];
+    }
     // kb_106
     else if ( layout == "jp" )
+    {
         kb = &kbList[ KB_106 ];
+    }
     // most keyboards are 105 key so default to that
     else
+    {
         kb = &kbList[ KB_105 ];
     }
+}
 
 
-
+bool
-bool KeyBoardPreview::loadCodes() {
+KeyBoardPreview::loadCodes()
+{
     if ( layout.isEmpty() )
+    {
         return false;
+    }
 
     QStringList param;
-    param << "-model" << "pc106" << "-layout" << layout << "-compact";
+    param << "-model"
+          << "pc106"
+          << "-layout" << layout << "-compact";
     if ( !variant.isEmpty() )
+    {
         param << "-variant" << variant;
+    }
 
 
     QProcess process;
-    process.setEnvironment(QStringList() << "LANG=C" << "LC_MESSAGES=C");
+    process.setEnvironment( QStringList() << "LANG=C"
+                                          << "LC_MESSAGES=C" );
     process.start( "ckbcomp", param );
     if ( !process.waitForStarted() )
     {
@@ -133,13 +165,18 @@ bool KeyBoardPreview::loadCodes() {
 
     const QStringList list = QString( process.readAll() ).split( "\n", SplitSkipEmptyParts );
 
-    for (const QString &line : list) {
+    for ( const QString& line : list )
+    {
         if ( !line.startsWith( "keycode" ) || !line.contains( '=' ) )
+        {
             continue;
+        }
 
         QStringList split = line.split( '=' ).at( 1 ).trimmed().split( ' ' );
         if ( split.size() < 4 )
+        {
             continue;
+        }
 
         Code code;
         code.plain = fromUnicodeString( split.at( 0 ) );
@@ -148,10 +185,14 @@ bool KeyBoardPreview::loadCodes() {
         code.alt = fromUnicodeString( split.at( 3 ) );
 
         if ( code.ctrl == code.plain )
+        {
             code.ctrl = "";
+        }
 
         if ( code.alt == code.plain )
+        {
             code.alt = "";
+        }
 
         codes.append( code );
     }
@@ -160,55 +201,73 @@ bool KeyBoardPreview::loadCodes() {
 }
 
 
-
+QString
-QString KeyBoardPreview::fromUnicodeString(QString raw) {
+KeyBoardPreview::fromUnicodeString( QString raw )
+{
     if ( raw.startsWith( "U+" ) )
+    {
         return QChar( raw.mid( 2 ).toInt( nullptr, 16 ) );
+    }
     else if ( raw.startsWith( "+U" ) )
+    {
         return QChar( raw.mid( 3 ).toInt( nullptr, 16 ) );
+    }
 
     return "";
 }
 
 
-
+QString
-QString KeyBoardPreview::regular_text(int index) {
+KeyBoardPreview::regular_text( int index )
+{
     if ( index < 0 || index >= codes.size() )
+    {
         return "";
+    }
 
     return codes.at( index - 1 ).plain;
 }
 
 
-
+QString
-QString KeyBoardPreview::shift_text(int index) {
+KeyBoardPreview::shift_text( int index )
+{
     if ( index < 0 || index >= codes.size() )
+    {
         return "";
+    }
 
     return codes.at( index - 1 ).shift;
 }
 
 
-
+QString
-QString KeyBoardPreview::ctrl_text(int index) {
+KeyBoardPreview::ctrl_text( int index )
+{
     if ( index < 0 || index >= codes.size() )
+    {
         return "";
+    }
 
     return codes.at( index - 1 ).ctrl;
 }
 
 
-
+QString
-QString KeyBoardPreview::alt_text(int index) {
+KeyBoardPreview::alt_text( int index )
+{
     if ( index < 0 || index >= codes.size() )
+    {
         return "";
+    }
 
     return codes.at( index - 1 ).alt;
 }
 
 
-
+void
-void KeyBoardPreview::resizeEvent(QResizeEvent *) {
+KeyBoardPreview::resizeEvent( QResizeEvent* )
+{
     space = 6;
     usable_width = width() - 7;
     key_w = ( usable_width - 14 * space ) / 15;
@@ -217,8 +276,9 @@ void KeyBoardPreview::resizeEvent(QResizeEvent *) {
 }
 
 
-
+void
-void KeyBoardPreview::paintEvent(QPaintEvent* event) {
+KeyBoardPreview::paintEvent( QPaintEvent* event )
+{
     QPainter p( this );
     p.setRenderHint( QPainter::Antialiasing );
 
@@ -242,31 +302,38 @@ void KeyBoardPreview::paintEvent(QPaintEvent* event) {
     int remaining_x[] = { 0, 0, 0, 0 };
     int remaining_widths[] = { 0, 0, 0, 0 };
 
-    for (int i = 0; i < 4; i++) {
+    for ( int i = 0; i < 4; i++ )
-        if (first_key_w > 0) {
+    {
+        if ( first_key_w > 0 )
+        {
             first_key_w = int( first_key_w * 1.375 );
 
             if ( kb == &kbList[ KB_105 ] && i == 3 )
+            {
                 first_key_w = int( key_w * 1.275 );
+            }
 
             p.drawRoundedRect( QRectF( 6, y, first_key_w, key_w ), rx, rx );
             x = 6 + first_key_w + space;
         }
-        else {
+        else
+        {
             first_key_w = key_w;
         }
 
 
-
         bool last_end = ( i == 1 && !kb->kb_extended_return );
         int rw = usable_width - x;
         int ii = 0;
 
-        for (int k : kb->keys.at(i)) {
+        for ( int k : kb->keys.at( i ) )
+        {
             QRectF rect = QRectF( x, y, key_w, key_w );
 
             if ( ii == kb->keys.at( i ).size() - 1 && last_end )
+            {
                 rect.setWidth( rw );
+            }
 
             p.drawRoundedRect( rect, rx, rx );
 
@@ -290,18 +357,20 @@ void KeyBoardPreview::paintEvent(QPaintEvent* event) {
         }
 
 
-
         remaining_x[ i ] = x;
         remaining_widths[ i ] = rw;
 
         if ( i != 1 && i != 2 )
+        {
             p.drawRoundedRect( QRectF( x, y, rw, key_w ), rx, rx );
+        }
 
         y = y + space + key_w;
     }
 
 
-    if (kb->kb_extended_return) {
+    if ( kb->kb_extended_return )
+    {
         rx = rx * 2;
         int x1 = remaining_x[ 1 ];
         int y1 = 6 + key_w * 1 + space * 1;
@@ -328,7 +397,8 @@ void KeyBoardPreview::paintEvent(QPaintEvent* event) {
 
         p.drawPath( pp );
     }
-    else {
+    else
+    {
         x = remaining_x[ 2 ];
         y = 6 + key_w * 2 + space * 2;
         p.drawRoundedRect( QRectF( x, y, remaining_widths[ 2 ], key_w ), rx, rx );

src/modules/keyboard/keyboardwidget/keyboardpreview.h

@@ -1,6 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Portions from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>
@@ -23,17 +25,17 @@
 #ifndef KEYBOARDPREVIEW_H
 #define KEYBOARDPREVIEW_H
 
-#include <QWidget>
+#include <QColor>
-#include <QRectF>
 #include <QFont>
 #include <QPainter>
-#include <QPen>
 #include <QPainterPath>
-#include <QColor>
+#include <QPen>
 #include <QPixmap>
 #include <QProcess>
+#include <QRectF>
 #include <QString>
 #include <QStringList>
+#include <QWidget>
 
 
 class KeyBoardPreview : public QWidget
@@ -46,14 +48,21 @@ public:
     void setVariant( QString variant );
 
 private:
-    enum KB_TYPE { KB_104, KB_105, KB_106 };
+    enum KB_TYPE
+    {
+        KB_104,
+        KB_105,
+        KB_106
+    };
 
-    struct KB {
+    struct KB
+    {
         bool kb_extended_return;
         QList< QList< int > > keys;
     };
 
-    struct Code {
+    struct Code
+    {
         QString plain, shift, ctrl, alt;
     };
 
@@ -74,7 +83,6 @@ private:
 protected:
     void paintEvent( QPaintEvent* event );
     void resizeEvent( QResizeEvent* event );
-
 };
 
 #endif  // KEYBOARDPREVIEW_H

src/modules/keyboardq/KeyboardQmlViewStep.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2020, Camilo Higuita <milo.h@aol.com>
+ *   SPDX-FileCopyrightText: 2020 Camilo Higuita <milo.h@aol.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/keyboardq/KeyboardQmlViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicensePage.cpp

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Alexandre Arnt <qtgzmanager@gmail.com>
+ *   SPDX-FileCopyrightText: 2015 Alexandre Arnt <qtgzmanager@gmail.com>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicensePage.h

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Alexandre Arnt <qtgzmanager@gmail.com>
+ *   SPDX-FileCopyrightText: 2015 Alexandre Arnt <qtgzmanager@gmail.com>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicenseViewStep.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicenseViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicenseWidget.cpp

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Alexandre Arnt <qtgzmanager@gmail.com>
+ *   SPDX-FileCopyrightText: 2015 Alexandre Arnt <qtgzmanager@gmail.com>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/LicenseWidget.h

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2015, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2015 Anke Boersma <demm@kaosx.us>
- *   Copyright 2015, Alexandre Arnt <qtgzmanager@gmail.com>
+ *   SPDX-FileCopyrightText: 2015 Alexandre Arnt <qtgzmanager@gmail.com>
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/license/README.md

@@ -1,11 +1,25 @@
 ### License Approval Module
----------
-For distributions shipping proprietary software, this module creates a globalstorage entry when the user accepts or declines one or more presented End User License Agreements files.
-The number of licenses shown are configurable.  The license.conf file has a few examples of how to add URLs.
 
-If you do not want to include this module in your Calamares build, add ```-DSKIP_MODULES="license"``` to your build settings (CMake call).
+<!-- SPDX-FileCopyrightText: 2015 Anke Boersma
+     SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
+     SPDX-License-Identifier: GPL-3.0-or-later
+-->
+
+For distributions shipping proprietary software, this module creates a
+Global Storage entry when the user accepts or declines one or more of
+the End User License Agreements files that are presented here.
+
+The number of licenses shown are configurable.  The `license.conf` file
+has a few examples of how to add URLs.
+
+If you do not want to include this module in your Calamares build,
+add `-DSKIP_MODULES="license"` to your build settings (CMake call).
+
+How to implement the removal or not installing of proprietary software is
+up to any distribution to implement.  For example, proprietary graphics
+drivers cannot simply be removed in the packages module, a free version
+will need to be installed.
 
-How to implement the removal or not installing of proprietary software is up to any distribution to implement.  For example, proprietary graphics drivers cannot simply be removed in the packages module, a free version will need to be installed.
 An example of where the licenseAgree globalstorage entry is used:
 https://github.com/KaOSx/calamares/blob/master/src/modules/nonfree_drivers/main.py
 

src/modules/locale/Config.cpp

@@ -2,7 +2,6 @@
  *
  *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
  *   SPDX-License-Identifier: GPL-3.0-or-later
- *   License-Filename: LICENSE
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/Config.h

@@ -2,7 +2,6 @@
  *
  *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
  *   SPDX-License-Identifier: GPL-3.0-or-later
- *   License-Filename: LICENSE
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LCLocaleDialog.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LCLocaleDialog.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LocaleConfiguration.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LocaleConfiguration.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LocalePage.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LocaleViewStep.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/LocaleViewStep.h

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/SetTimezoneJob.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2015, Rohan Garg <rohan@garg.io>
+ *   SPDX-FileCopyrightText: 2015 Rohan Garg <rohan@garg.io>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/SetTimezoneJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/images/bg.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/locale/images/pin.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/locale/timezonewidget/TimeZoneImage.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/timezonewidget/TimeZoneImage.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/locale/timezonewidget/timezonewidget.cpp

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>

src/modules/locale/timezonewidget/timezonewidget.h

@@ -1,7 +1,9 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2007 Free Software Foundation, Inc.
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>

src/modules/localeq/LocaleQmlViewStep.cpp

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018,2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 20182020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/localeq/LocaleQmlViewStep.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/localeq/Map.qml

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/localeq/Offline.qml

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/localeq/i18n.qml

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/localeq/img/chevron-left-solid.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 https://github.com/FortAwesome/Font-Awesome
+SPDX-License-Identifier: CC-BY-4.0

src/modules/localeq/img/locale.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/localeq/img/minus.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/localeq/img/pin.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/localeq/img/plus.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/localeq/img/worldmap.png.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 demmm <anke62@gmail.com>
+SPDX-License-Identifier: GPL-3.0-or-later

src/modules/localeq/localeq.qml

@@ -1,7 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
- *   Copyright 2020, Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp

@@ -1,19 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
- *   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 "LuksBootKeyFileJob.h"

src/modules/luksbootkeyfile/LuksBootKeyFileJob.h

@@ -1,19 +1,8 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
- *   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 LUKSBOOTKEYFILEJOB_H

src/modules/machineid/MachineIdJob.cpp

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2014 Kevin Kofler <kevin.kofler@chello.at>
- *   Copyright 2016, Philip Müller <philm@manjaro.org>
+ *   SPDX-FileCopyrightText: 2016 Philip Müller <philm@manjaro.org>
- *   Copyright 2017, Alf Gaida <agaida@siduction.org>
+ *   SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
- *   Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/machineid/MachineIdJob.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/machineid/Tests.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/machineid/Workers.cpp

@@ -1,9 +1,10 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
+ *   SPDX-FileCopyrightText: 2014 Kevin Kofler <kevin.kofler@chello.at>
- *   Copyright 2016, Philip Müller <philm@manjaro.org>
+ *   SPDX-FileCopyrightText: 2016 Philip Müller <philm@manjaro.org>
- *   Copyright 2017, Alf Gaida <agaida@siduction.org>
+ *   SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
- *   Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/machineid/Workers.h

@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
- *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/netinstall/Config.cpp

@@ -1,9 +1,10 @@
 /*
- *   Copyright 2016, Luca Giambonini <almack@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Luca Giambonini <almack@chakraos.org>
- *   Copyright 2016, Lisa Vitolo     <shainer@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Lisa Vitolo     <shainer@chakraos.org>
- *   Copyright 2017, Kyle Robbertze  <krobbertze@gmail.com>
+ *   SPDX-FileCopyrightText: 2017 Kyle Robbertze  <krobbertze@gmail.com>
- *   Copyright 2017-2018, 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 2020, Adriaan de Groot <groot@kde.org>
- *   Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
+ *   SPDX-FileCopyrightText: 2017 Gabriel Craciunescu <crazy@frugalware.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/netinstall/Config.h

@@ -1,8 +1,9 @@
 /*
- *   Copyright 2016, Luca Giambonini <almack@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Luca Giambonini <almack@chakraos.org>
- *   Copyright 2016, Lisa Vitolo     <shainer@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Lisa Vitolo     <shainer@chakraos.org>
- *   Copyright 2017, Kyle Robbertze  <krobbertze@gmail.com>
+ *   SPDX-FileCopyrightText: 2017 Kyle Robbertze  <krobbertze@gmail.com>
- *   Copyright 2017-2018, 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/modules/netinstall/NetInstallPage.cpp

@@ -1,9 +1,10 @@
 /*
- *   Copyright 2016, Luca Giambonini <almack@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Luca Giambonini <almack@chakraos.org>
- *   Copyright 2016, Lisa Vitolo     <shainer@chakraos.org>
+ *   SPDX-FileCopyrightText: 2016 Lisa Vitolo     <shainer@chakraos.org>
- *   Copyright 2017, Kyle Robbertze  <krobbertze@gmail.com>
+ *   SPDX-FileCopyrightText: 2017 Kyle Robbertze  <krobbertze@gmail.com>
- *   Copyright 2017-2018, 2020, Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2017-2018 2020, Adriaan de Groot <groot@kde.org>
- *   Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
+ *   SPDX-FileCopyrightText: 2017 Gabriel Craciunescu <crazy@frugalware.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by