[libcalamaresui] Remove the requiredModules setting
- The value set in module.desc was never stored for use, but isn't an attribute of the instance, either. It belongs with the descriptor, in ModuleManager.
This commit is contained in:
parent
40252f1000
commit
731594fb40
@ -224,13 +224,6 @@ Module::instanceKey() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QStringList
|
|
||||||
Module::requiredModules() const
|
|
||||||
{
|
|
||||||
return m_requiredModules;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
QString
|
QString
|
||||||
Module::location() const
|
Module::location() const
|
||||||
{
|
{
|
||||||
@ -286,7 +279,6 @@ void
|
|||||||
Module::initFrom( const QVariantMap& moduleDescriptor )
|
Module::initFrom( const QVariantMap& moduleDescriptor )
|
||||||
{
|
{
|
||||||
m_name = moduleDescriptor.value( "name" ).toString();
|
m_name = moduleDescriptor.value( "name" ).toString();
|
||||||
|
|
||||||
if ( moduleDescriptor.contains( EMERGENCY ) )
|
if ( moduleDescriptor.contains( EMERGENCY ) )
|
||||||
m_maybe_emergency = moduleDescriptor[ EMERGENCY ].toBool();
|
m_maybe_emergency = moduleDescriptor[ EMERGENCY ].toBool();
|
||||||
}
|
}
|
||||||
|
@ -106,13 +106,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual QString instanceKey() const final;
|
virtual QString instanceKey() const final;
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief requiredModules a list of names of modules required by this one.
|
|
||||||
* @return the list of names.
|
|
||||||
* The module dependencies system is currently incomplete and unused.
|
|
||||||
*/
|
|
||||||
virtual QStringList requiredModules() const;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief location returns the full path of this module's directory.
|
* @brief location returns the full path of this module's directory.
|
||||||
* @return the path.
|
* @return the path.
|
||||||
@ -198,7 +191,6 @@ private:
|
|||||||
void loadConfigurationFile( const QString& configFileName ); //throws YAML::Exception
|
void loadConfigurationFile( const QString& configFileName ); //throws YAML::Exception
|
||||||
|
|
||||||
QString m_name;
|
QString m_name;
|
||||||
QStringList m_requiredModules;
|
|
||||||
QString m_directory;
|
QString m_directory;
|
||||||
QString m_instanceId;
|
QString m_instanceId;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user