From 649eb94d24b7ca9960a7a8c07455ed08c60a13a3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Jan 2020 19:29:47 +0100 Subject: [PATCH] [libcalamaresui] Type-alias for module descriptors --- src/libcalamaresui/modulesystem/ModuleManager.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h index fca5d0ec9..37fa6b60c 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.h +++ b/src/libcalamaresui/modulesystem/ModuleManager.h @@ -45,6 +45,8 @@ class ModuleManager : public QObject { Q_OBJECT public: + using ModuleDescriptor = QVariantMap; /// TODO: Should be strongly-typed instead + explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); virtual ~ModuleManager() override; @@ -69,7 +71,7 @@ public: * @param name the name of the module for which to return the module descriptor. * @return the module descriptor, as a variant map already parsed from YAML. */ - QVariantMap moduleDescriptor( const QString& name ); + ModuleDescriptor moduleDescriptor( const QString& name ); /** * @brief moduleInstance returns a Module object for a given instance key. @@ -126,7 +128,7 @@ private: */ bool checkModuleDependencies( const Module& ); - QMap< QString, QVariantMap > m_availableDescriptorsByModuleName; + QMap< QString, ModuleDescriptor > m_availableDescriptorsByModuleName; QMap< QString, QString > m_moduleDirectoriesByModuleName; QMap< ModuleSystem::InstanceKey, Module* > m_loadedModulesByInstanceKey; const QStringList m_paths;