napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Adjust module test-loader for changed API

Browse Source 
- the test-loader needs to create modules (and does so hackishly,
  outside of the ModuleManager) so it needs to chase the API as well.
This commit is contained in:
Adriaan de Groot 2020-08-11 22:13:04 +02:00
parent 3c6e53ecb9
commit 60fbf04594
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calamares/testmain.cpp
View File

@ -184,13 +184,13 @@ public:
void loadSelf() override; void loadSelf() override;
virtual Type type() const override; virtual Calamares::ModuleSystem::Type type() const override;
virtual Interface interface() const override; virtual Calamares::ModuleSystem::Interface interface() const override;
virtual Calamares::JobList jobs() const override; virtual Calamares::JobList jobs() const override;
protected: protected:
void initFrom( const QVariantMap& ) override; void initFrom( const Calamares::ModuleSystem::Descriptor& ) override;
}; };
ExecViewModule::ExecViewModule() ExecViewModule::ExecViewModule()
@ -201,13 +201,13 @@ ExecViewModule::ExecViewModule()
// We don't have one, so build one -- this gives us "x@x". // We don't have one, so build one -- this gives us "x@x".
QVariantMap m; QVariantMap m;
m.insert( "name", "x" ); m.insert( "name", "x" );
Calamares::Module::initFrom( m, "x" ); Calamares::Module::initFrom( Calamares::ModuleSystem::Descriptor::fromDescriptorData(m), "x" );
} }
ExecViewModule::~ExecViewModule() {} ExecViewModule::~ExecViewModule() {}
void void
ExecViewModule::initFrom( const QVariantMap& ) ExecViewModule::initFrom( const Calamares::ModuleSystem::Descriptor& )
{ {
} }
@ -332,7 +332,7 @@ load_module( const ModuleConfig& moduleConfig )
cDebug() << "Module" << moduleName << "job-configuration:" << configFile; cDebug() << "Module" << moduleName << "job-configuration:" << configFile;
Calamares::Module* module = Calamares::moduleFromDescriptor( descriptor, name, configFile, moduleDirectory ); Calamares::Module* module = Calamares::moduleFromDescriptor( Calamares::ModuleSystem::Descriptor::fromDescriptorData( descriptor ), name, configFile, moduleDirectory );
return module; return module;
} }