From 7034985b7403b8a9ecf56a38a8cdb37d58488d8c Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 11 Jul 2014 14:41:53 +0200 Subject: [PATCH] Remove MM:loadModulesPrepare. --- src/calamares/CalamaresApplication.cpp | 2 +- src/libcalamaresui/modulesystem/ModuleManager.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 21076efe5..8aec1a3bd 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -151,7 +151,7 @@ CalamaresApplication::onPluginsReady() m_mainwindow = new CalamaresWindow(); - m_moduleManager->loadModulesPrepare(); + m_moduleManager->loadModules( Calamares::Prepare ); connect( m_moduleManager, &Calamares::ModuleManager::modulesLoaded, [this] { m_mainwindow->show(); diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h index 19d113c65..e35c1274f 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.h +++ b/src/libcalamaresui/modulesystem/ModuleManager.h @@ -49,7 +49,6 @@ public: Module* module( const QString& name ); void loadModules( Phase phase ); - void loadModulesPrepare() { loadModules( Prepare ); } signals: void initDone();