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

Make ModuleManager accessible from outside CalamaresApplication.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-03-10 19:48:11 +01:00
parent 4e2e964503
commit dda7ea211d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -32,11 +32,24 @@
namespace Calamares namespace Calamares
{ {
ModuleManager* ModuleManager::s_instance = nullptr;
ModuleManager*
ModuleManager::instance()
{
return s_instance;
}
ModuleManager::ModuleManager( const QStringList& paths, QObject* parent ) ModuleManager::ModuleManager( const QStringList& paths, QObject* parent )
: QObject( parent ) : QObject( parent )
, m_paths( paths ) , m_paths( paths )
, m_lastPhaseLoaded( Phase_NULL ) , m_lastPhaseLoaded( Phase_NULL )
{ {
Q_ASSERT( !s_instance );
s_instance = this;
} }
ModuleManager::~ModuleManager() ModuleManager::~ModuleManager()

6
src/libcalamaresui/modulesystem/ModuleManager.h
View File

@ -38,6 +38,8 @@ public:
explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr );
virtual ~ModuleManager(); virtual ~ModuleManager();
static ModuleManager* instance();
/** /**
* @brief init goes through the module search directories and gets a list of * @brief init goes through the module search directories and gets a list of
* modules available for loading, along with their metadata. * modules available for loading, along with their metadata.
@ -64,10 +66,10 @@ private:
void checkDependencies(); void checkDependencies();
QMap< QString, Module* > m_availableModules; QMap< QString, Module* > m_availableModules;
QStringList m_paths; QStringList m_paths;
Phase m_lastPhaseLoaded; Phase m_lastPhaseLoaded;
static ModuleManager* s_instance;
}; };
} }