From ea709aab59f51a784b735299e1f0808fd30d9fad Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 4 Aug 2020 01:31:22 +0200
Subject: [PATCH] [libcalamaresui] Swap out unstructured string for structured
 data

---
 src/calamares/DebugWindow.cpp                      | 2 +-
 src/calamares/testmain.cpp                         | 2 +-
 src/libcalamaresui/modulesystem/ModuleManager.cpp  | 6 +++---
 src/libcalamaresui/modulesystem/ModuleManager.h    | 2 +-
 src/libcalamaresui/viewpages/ExecutionViewStep.cpp | 4 ++--
 src/libcalamaresui/viewpages/ExecutionViewStep.h   | 5 +++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
index 82533a648..9e2bdc501 100644
--- a/src/calamares/DebugWindow.cpp
+++ b/src/calamares/DebugWindow.cpp
@@ -193,7 +193,7 @@ DebugWindow::DebugWindow()
 #endif
     ] {
                  QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
-                 Module* module = ModuleManager::instance()->moduleInstance( moduleName );
+                 Module* module = ModuleManager::instance()->moduleInstance( ModuleSystem::InstanceKey::fromString( moduleName ) );
                  if ( module )
                  {
                      m_module = module->configurationMap();
diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index a29c8ce91..c9ac00f2b 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -217,7 +217,7 @@ ExecViewModule::loadSelf()
     auto* viewStep = new Calamares::ExecutionViewStep();
     viewStep->setModuleInstanceKey( instanceKey() );
     viewStep->setConfigurationMap( m_configurationMap );
-    viewStep->appendJobModuleInstanceKey( instanceKey().toString() );
+    viewStep->appendJobModuleInstanceKey( instanceKey() );
     Calamares::ViewManager::instance()->addViewStep( viewStep );
     m_loaded = true;
 }
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 23df7ce8a..c872bdaa4 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -151,9 +151,9 @@ ModuleManager::moduleDescriptor( const QString& name )
 }
 
 Module*
-ModuleManager::moduleInstance( const QString& instanceKey )
+ModuleManager::moduleInstance( const ModuleSystem::InstanceKey& instanceKey )
 {
-    return m_loadedModulesByInstanceKey.value( ModuleSystem::InstanceKey::fromString( instanceKey ) );
+    return m_loadedModulesByInstanceKey.value( instanceKey );
 }
 
 
@@ -320,7 +320,7 @@ ModuleManager::loadModules()
                     ViewManager::instance()->addViewStep( evs );
                 }
 
-                evs->appendJobModuleInstanceKey( instanceKey.toString() );
+                evs->appendJobModuleInstanceKey( instanceKey );
             }
         }
     }
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h
index bea8acf41..d079baee7 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.h
+++ b/src/libcalamaresui/modulesystem/ModuleManager.h
@@ -76,7 +76,7 @@ public:
      * @param instanceKey the instance key for a module instance.
      * @return a pointer to an object of a subtype of Module.
      */
-    Module* moduleInstance( const QString& instanceKey );
+    Module* moduleInstance( const ModuleSystem::InstanceKey& instanceKey );
 
     /**
      * @brief loadModules does all of the module loading operation.
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
index 2dd4b79df..b2205d70e 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
@@ -147,7 +147,7 @@ ExecutionViewStep::onActivate()
     m_slideshow->changeSlideShowState( Slideshow::Start );
 
     JobQueue* queue = JobQueue::instance();
-    foreach ( const QString& instanceKey, m_jobInstanceKeys )
+    for( const auto& instanceKey : m_jobInstanceKeys )
     {
         Calamares::Module* module = Calamares::ModuleManager::instance()->moduleInstance( instanceKey );
         if ( module )
@@ -176,7 +176,7 @@ ExecutionViewStep::jobs() const
 
 
 void
-ExecutionViewStep::appendJobModuleInstanceKey( const QString& instanceKey )
+ExecutionViewStep::appendJobModuleInstanceKey( const ModuleSystem::InstanceKey& instanceKey )
 {
     m_jobInstanceKeys.append( instanceKey );
 }
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.h b/src/libcalamaresui/viewpages/ExecutionViewStep.h
index 48604fe93..0edb965a1 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.h
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.h
@@ -21,6 +21,7 @@
 #define EXECUTIONVIEWSTEP_H
 
 #include "ViewStep.h"
+#include "modulesystem/InstanceKey.h"
 
 #include <QStringList>
 
@@ -57,7 +58,7 @@ public:
 
     JobList jobs() const override;
 
-    void appendJobModuleInstanceKey( const QString& instanceKey );
+    void appendJobModuleInstanceKey( const ModuleSystem::InstanceKey& instanceKey );
 
 private:
     QWidget* m_widget;
@@ -65,7 +66,7 @@ private:
     QLabel* m_label;
     Slideshow* m_slideshow;
 
-    QStringList m_jobInstanceKeys;
+    QList< ModuleSystem::InstanceKey > m_jobInstanceKeys;
 
     void updateFromJobQueue( qreal percent, const QString& message );
 };