From 490875cdb4519fec1814b360651c5daf37ba97fc Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Sep 2015 19:06:04 +0200 Subject: [PATCH] There is no prepare phase any more. --- .../progresstree/ProgressTreeModel.cpp | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/calamares/progresstree/ProgressTreeModel.cpp b/src/calamares/progresstree/ProgressTreeModel.cpp index 03432328a..530b42796 100644 --- a/src/calamares/progresstree/ProgressTreeModel.cpp +++ b/src/calamares/progresstree/ProgressTreeModel.cpp @@ -132,30 +132,10 @@ ProgressTreeModel::setupModelData() m_rootItem = new ProgressTreeRoot(); const Calamares::ViewManager* vm = Calamares::ViewManager::instance(); - foreach ( const Calamares::ViewStep* step, vm->prepareSteps() ) + foreach ( const Calamares::ViewStep* step, vm->viewSteps() ) { m_rootItem->appendChild( new ViewStepItem( step, m_rootItem ) ); } - - m_rootItem->appendChild( new ViewStepItem( - []() -> QString - { - return tr( "Install" ); - }, - [vm]() -> const Calamares::ViewStep* - { - return vm->installationStep(); - }, m_rootItem ) ); - - m_rootItem->appendChild( new ViewStepItem( - []() -> QString - { - return tr( "Finish" ); - }, - [vm]() -> const Calamares::ViewStep* - { - return vm->finishedStep(); - }, m_rootItem ) ); }