From 641e186b7c81957e50f1d01557e1ae5a2bf4141a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 10 Sep 2023 23:55:48 +0200 Subject: [PATCH] libcalamares: use namespace Calamares::Packages consistently --- src/libcalamares/packages/Globals.cpp | 14 +++++++------- src/libcalamares/packages/Globals.h | 4 ++-- src/libcalamares/packages/Tests.cpp | 23 +++++++++++------------ src/modules/netinstall/Config.cpp | 2 +- src/modules/packagechooser/Config.cpp | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp index aedbc2119..ace172a49 100644 --- a/src/libcalamares/packages/Globals.cpp +++ b/src/libcalamares/packages/Globals.cpp @@ -66,18 +66,18 @@ additions( Calamares::GlobalStorage* gs, } bool -CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, - const Calamares::ModuleSystem::InstanceKey& module, - const QVariantList& installPackages, - const QVariantList& tryInstallPackages ) +Calamares::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) { return additions( gs, module.toString(), installPackages, tryInstallPackages ); } bool -CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, - const Calamares::ModuleSystem::InstanceKey& module, - const QStringList& installPackages ) +Calamares::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QStringList& installPackages ) { QVariantList l; for ( const auto& s : installPackages ) diff --git a/src/libcalamares/packages/Globals.h b/src/libcalamares/packages/Globals.h index a83152ff2..222d6cedb 100644 --- a/src/libcalamares/packages/Globals.h +++ b/src/libcalamares/packages/Globals.h @@ -13,7 +13,7 @@ #include "GlobalStorage.h" #include "modulesystem/InstanceKey.h" -namespace CalamaresUtils +namespace Calamares { namespace Packages { @@ -38,7 +38,7 @@ bool setGSPackageAdditions( Calamares::GlobalStorage* gs, const QStringList& installPackages ); // void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages ); } // namespace Packages -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/packages/Tests.cpp b/src/libcalamares/packages/Tests.cpp index a0422cb36..00d70da33 100644 --- a/src/libcalamares/packages/Tests.cpp +++ b/src/libcalamares/packages/Tests.cpp @@ -52,10 +52,10 @@ PackagesTests::testEmpty() QCOMPARE( k.toString(), "this@that" ); // Adding nothing at all does nothing - QVERIFY( !CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariantList(), QVariantList() ) ); + QVERIFY( !Calamares::Packages::setGSPackageAdditions( &gs, k, QVariantList(), QVariantList() ) ); QVERIFY( !gs.contains( topKey ) ); - QVERIFY( !CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QStringList() ) ); + QVERIFY( !Calamares::Packages::setGSPackageAdditions( &gs, k, QStringList() ) ); QVERIFY( !gs.contains( topKey ) ); } @@ -88,8 +88,7 @@ PackagesTests::testAdd() { QVERIFY( !gs.contains( topKey ) ); - QVERIFY( - CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariant( packages ).toList(), QVariantList() ) ); + QVERIFY( Calamares::Packages::setGSPackageAdditions( &gs, k, QVariant( packages ).toList(), QVariantList() ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 1 ); @@ -104,7 +103,7 @@ PackagesTests::testAdd() cDebug() << op; } { - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); + QVERIFY( Calamares::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 2 ); // One for each instance key! @@ -118,7 +117,7 @@ PackagesTests::testAdd() { // Replace one and expect differences packages << extraEditor; - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); + QVERIFY( Calamares::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 2 ); // One for each instance key! @@ -160,8 +159,8 @@ PackagesTests::testAddMixed() // Just one { QVERIFY( !gs.contains( topKey ) ); - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( - &gs, k, QVariantList { QString( "vim" ) }, QVariantList() ) ); + QVERIFY( + Calamares::Packages::setGSPackageAdditions( &gs, k, QVariantList { QString( "vim" ) }, QVariantList() ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 1 ); @@ -175,7 +174,7 @@ PackagesTests::testAddMixed() // Replace with two packages { - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( + QVERIFY( Calamares::Packages::setGSPackageAdditions( &gs, k, QVariantList { QString( "vim" ), QString( "emacs" ) }, QVariantList() ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); @@ -192,8 +191,8 @@ PackagesTests::testAddMixed() // Replace with one (different) package { - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( - &gs, k, QVariantList { QString( "nano" ) }, QVariantList() ) ); + QVERIFY( + Calamares::Packages::setGSPackageAdditions( &gs, k, QVariantList { QString( "nano" ) }, QVariantList() ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 1 ); @@ -208,7 +207,7 @@ PackagesTests::testAddMixed() // Now we have two sources { - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, QStringList( extraEditor ) ) ); + QVERIFY( Calamares::Packages::setGSPackageAdditions( &gs, otherInstance, QStringList( extraEditor ) ) ); QVERIFY( gs.contains( topKey ) ); auto actionList = gs.value( topKey ).toList(); QCOMPARE( actionList.length(), 2 ); diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 4dadb23da..40ba73f71 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -178,6 +178,6 @@ Config::finalizeGlobalStorage( const Calamares::ModuleSystem::InstanceKey& key ) } } - CalamaresUtils::Packages::setGSPackageAdditions( + Calamares::Packages::setGSPackageAdditions( Calamares::JobQueue::instance()->globalStorage(), key, installPackages, tryInstallPackages ); } diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 00a4f4b6f..6a064dcd2 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -144,7 +144,7 @@ Config::updateGlobalStorage( const QStringList& selected ) const { QStringList packageNames = m_model->getInstallPackagesForNames( selected ); cDebug() << m_defaultId << "packages to install" << packageNames; - CalamaresUtils::Packages::setGSPackageAdditions( + Calamares::Packages::setGSPackageAdditions( Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames ); } else if ( m_method == PackageChooserMethod::NetAdd )