From fa28788f7832fd929080f2c590d51a65f1445bf1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 23 Mar 2020 14:21:41 +0100
Subject: [PATCH] [netinstall] Build the model from QVariantList always

---
 src/modules/netinstall/PackageModel.cpp | 42 +------------------------
 src/modules/netinstall/PackageModel.h   |  1 -
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index 0ac8116b3..3a4deaf9a 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -26,7 +26,7 @@ PackageModel::PackageModel( const YAML::Node& data, QObject* parent )
     : QAbstractItemModel( parent )
 {
     m_rootItem = new PackageTreeItem();
-    setupModelData( data, m_rootItem );
+    setupModelData( CalamaresUtils::yamlSequenceToVariant( data ), m_rootItem );
 }
 
 PackageModel::PackageModel( const QVariantList& data, QObject* parent )
@@ -262,43 +262,3 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
         }
     }
 }
-
-void
-PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
-{
-    for ( YAML::const_iterator it = data.begin(); it != data.end(); ++it )
-    {
-        const YAML::Node itemDefinition = *it;
-        PackageTreeItem* item = new PackageTreeItem( CalamaresUtils::yamlMapToVariant( itemDefinition ), parent );
-
-        if ( itemDefinition[ "selected" ] )
-        {
-            item->setSelected( getBool( itemDefinition, "selected" ) ? Qt::Checked : Qt::Unchecked );
-        }
-
-        if ( itemDefinition[ "packages" ] )
-        {
-            for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin();
-                  packageIt != itemDefinition[ "packages" ].end();
-                  ++packageIt )
-            {
-                item->appendChild(
-                    new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) );
-            }
-        }
-        if ( itemDefinition[ "subgroups" ] )
-        {
-            setupModelData( itemDefinition[ "subgroups" ], item );
-        }
-
-        if ( item->isHidden() )
-        {
-            m_hiddenItems.append( item );
-        }
-        else
-        {
-            item->setCheckable( true );
-            parent->appendChild( item );
-        }
-    }
-}
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index 4d127970b..04004b661 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -68,7 +68,6 @@ public:
 private:
     friend class ItemTests;
 
-    void setupModelData( const YAML::Node& data, PackageTreeItem* parent );
     void setupModelData( const QVariantList& l, PackageTreeItem* parent );
 
     PackageTreeItem* m_rootItem;