applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-23 18:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamaresui] Refactor Module::initFrom()

Browse source 
- generic initFrom() also sets the instance id
 - subclass-specific initFrom() now pure virtual in base
 - chase changes in subclasses
This commit is contained in:
Adriaan de Groot 2020-01-12 11:37:22 +01:00
parent c482990bc5
commit a7e1a1f9fc
7 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libcalamaresui/modulesystem/CppJobModule.cpp
View file

@ -86,7 +86,6 @@ CppJobModule::jobs() const
void
CppJobModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( moduleDescriptor );
QDir directory( location() );
QString load;
if ( !moduleDescriptor.value( "load" ).toString().isEmpty() )

35
src/libcalamaresui/modulesystem/Module.cpp
View file

@ -48,8 +48,24 @@ static const char EMERGENCY[] = "emergency";
namespace Calamares
{
Module::Module()
: m_loaded( false )
{
}
Module::~Module() {}
void
Module::initFrom( const QVariantMap& moduleDescriptor, const QString& id )
{
m_name = moduleDescriptor.value( "name" ).toString();
m_instanceId = id;
if ( moduleDescriptor.contains( EMERGENCY ) )
{
m_maybe_emergency = moduleDescriptor[ EMERGENCY ].toBool();
}
}
Module*
Module::fromDescriptor( const QVariantMap& moduleDescriptor,
const QString& instanceId,
@ -131,8 +147,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
return nullptr;
}
m->m_instanceId = instanceId;
m->initFrom( moduleDescriptor, instanceId );
m->initFrom( moduleDescriptor );
try
{
@ -290,22 +305,6 @@ Module::configurationMap()
}
Module::Module()
: m_loaded( false )
{
}
void
Module::initFrom( const QVariantMap& moduleDescriptor )
{
m_name = moduleDescriptor.value( "name" ).toString();
if ( moduleDescriptor.contains( EMERGENCY ) )
{
m_maybe_emergency = moduleDescriptor[ EMERGENCY ].toBool();
}
}
RequirementsList
Module::checkRequirements()
{

7
src/libcalamaresui/modulesystem/Module.h
View file

@ -173,7 +173,12 @@ public:
protected:
explicit Module();
virtual void initFrom( const QVariantMap& moduleDescriptor );
/// @brief For subclasses to read their part of the descriptor
virtual void initFrom( const QVariantMap& moduleDescriptor ) = 0;
/// @brief Generic part of descriptor reading (and instance id)
void initFrom( const QVariantMap& moduleDescriptor, const QString& id );
QVariantMap m_configurationMap;
bool m_loaded = false;

1
src/libcalamaresui/modulesystem/ProcessJobModule.cpp
View file

@ -63,7 +63,6 @@ ProcessJobModule::jobs() const
void
ProcessJobModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( moduleDescriptor );
QDir directory( location() );
m_workingPath = directory.absolutePath();

1
src/libcalamaresui/modulesystem/PythonJobModule.cpp
View file

@ -64,7 +64,6 @@ PythonJobModule::jobs() const
void
PythonJobModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( moduleDescriptor );
QDir directory( location() );
m_workingPath = directory.absolutePath();

1
src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
View file

@ -174,7 +174,6 @@ PythonQtViewModule::jobs() const
void
PythonQtViewModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( moduleDescriptor );
QDir directory( location() );
m_workingPath = directory.absolutePath();

1
src/libcalamaresui/modulesystem/ViewModule.cpp
View file

@ -91,7 +91,6 @@ ViewModule::jobs() const
void
ViewModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( moduleDescriptor );
QDir directory( location() );
QString load;
if ( !moduleDescriptor.value( "load" ).toString().isEmpty() )