[libcalamaresui] Type-alias for module descriptors

This commit is contained in:
Adriaan de Groot 2020-01-21 19:29:47 +01:00
parent 8fbe676280
commit 649eb94d24

View File

@ -45,6 +45,8 @@ class ModuleManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
using ModuleDescriptor = QVariantMap; /// TODO: Should be strongly-typed instead
explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr );
virtual ~ModuleManager() override; virtual ~ModuleManager() override;
@ -69,7 +71,7 @@ public:
* @param name the name of the module for which to return the module descriptor. * @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. * @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. * @brief moduleInstance returns a Module object for a given instance key.
@ -126,7 +128,7 @@ private:
*/ */
bool checkModuleDependencies( const Module& ); bool checkModuleDependencies( const Module& );
QMap< QString, QVariantMap > m_availableDescriptorsByModuleName; QMap< QString, ModuleDescriptor > m_availableDescriptorsByModuleName;
QMap< QString, QString > m_moduleDirectoriesByModuleName; QMap< QString, QString > m_moduleDirectoriesByModuleName;
QMap< ModuleSystem::InstanceKey, Module* > m_loadedModulesByInstanceKey; QMap< ModuleSystem::InstanceKey, Module* > m_loadedModulesByInstanceKey;
const QStringList m_paths; const QStringList m_paths;