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

[calamares] Need a JobQueue and global storage before running any job.

Browse Source 
The 'singleton' instances don't do a very good job of being singletons
or ensuring their own creation.
This commit is contained in:
Adriaan de Groot 2018-02-27 01:34:32 +01:00
parent 48771f968a
commit 182458ad5a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calamares/testmain.cpp
View File

@ -28,6 +28,7 @@
#include "Settings.h" #include "Settings.h"
#include "Job.h" #include "Job.h"
#include "JobQueue.h"
#include <QCommandLineOption> #include <QCommandLineOption>
#include <QCommandLineParser> #include <QCommandLineParser>
@ -155,6 +156,8 @@ main( int argc, char* argv[] )
return 1; return 1;
std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) ); std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) );
std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
cDebug() << "Calamares test module-loader" << module.moduleName(); cDebug() << "Calamares test module-loader" << module.moduleName();
Calamares::Module* m = load_module( module ); Calamares::Module* m = load_module( module );
if ( !m ) if ( !m )