From 6662cb5f2d8b2d96b034f651972fc4aad1407836 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 13:17:33 +0100 Subject: [PATCH] [netinstall] Swap parameters to makeSourceItem and document it --- src/modules/netinstall/Config.cpp | 6 +++--- src/modules/netinstall/Config.h | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 233bc65dd..017164c86 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -171,7 +171,7 @@ Config::receivedGroupData() } Config::SourceItem -Config::SourceItem::makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ) +Config::SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ) { if ( groupsUrl == QStringLiteral( "local" ) ) { @@ -211,13 +211,13 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) const auto& groupsUrlVariant = configurationMap.value( key ); if ( groupsUrlVariant.type() == QVariant::String ) { - m_urls.append( SourceItem::makeSourceItem( configurationMap, groupsUrlVariant.toString() ) ); + m_urls.append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); } else if ( groupsUrlVariant.type() == QVariant::StringList ) { for ( const auto& s : groupsUrlVariant.toStringList() ) { - m_urls.append( SourceItem::makeSourceItem( configurationMap, s ) ); + m_urls.append( SourceItem::makeSourceItem( s, configurationMap ) ); } } diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 84ab027cd..de96ccee4 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -99,7 +99,13 @@ private: bool isUrl() const { return url.isValid(); } bool isLocal() const { return !data.isEmpty(); } bool isValid() const { return isUrl() || isLocal(); } - static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ); + /** @brief Create a SourceItem + * + * If the @p groupsUrl is @c "local" then the *groups* key in + * the @p configurationMap is used as the source; otherwise the + * string is used as an actual URL. + */ + static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap ); }; QQueue< SourceItem > m_urls;