[libcalamaresui] Move ExecutionViewStep where it belongs

- viewpages/ collects the ViewStep implementations
 - chase header moving and tidy some #includes
This commit is contained in:
Adriaan de Groot 2020-01-10 11:56:30 +01:00
parent 970702daa0
commit 16a460adff
6 changed files with 10 additions and 11 deletions

View File

@ -18,6 +18,7 @@ set( calamaresui_SOURCES
utils/Paste.cpp utils/Paste.cpp
viewpages/BlankViewStep.cpp viewpages/BlankViewStep.cpp
viewpages/ExecutionViewStep.cpp
viewpages/ViewStep.cpp viewpages/ViewStep.cpp
widgets/ClickableLabel.cpp widgets/ClickableLabel.cpp
@ -25,7 +26,6 @@ set( calamaresui_SOURCES
widgets/WaitingWidget.cpp widgets/WaitingWidget.cpp
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
ExecutionViewStep.cpp
Branding.cpp Branding.cpp
ViewManager.cpp ViewManager.cpp
) )

View File

@ -21,17 +21,16 @@
#include "ViewManager.h" #include "ViewManager.h"
#include "viewpages/BlankViewStep.h"
#include "viewpages/ViewStep.h"
#include "Branding.h" #include "Branding.h"
#include "ExecutionViewStep.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "Settings.h" #include "Settings.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Paste.h" #include "utils/Paste.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "viewpages/BlankViewStep.h"
#include "viewpages/ViewStep.h"
#include "viewpages/ExecutionViewStep.h"
#include <QApplication> #include <QApplication>
#include <QBoxLayout> #include <QBoxLayout>

View File

@ -19,7 +19,6 @@
#include "ModuleManager.h" #include "ModuleManager.h"
#include "ExecutionViewStep.h"
#include "Module.h" #include "Module.h"
#include "RequirementsChecker.h" #include "RequirementsChecker.h"
#include "Settings.h" #include "Settings.h"
@ -27,6 +26,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Yaml.h" #include "utils/Yaml.h"
#include "viewpages/ExecutionViewStep.h"
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>

View File

@ -18,16 +18,16 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <ExecutionViewStep.h> #include "ExecutionViewStep.h"
#include "Branding.h" #include "Branding.h"
#include "Job.h" #include "Job.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "Settings.h" #include "Settings.h"
#include "ViewManager.h" #include "ViewManager.h"
#include "modulesystem/Module.h" #include "modulesystem/Module.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Dirs.h" #include "utils/Dirs.h"
#include "utils/Logger.h" #include "utils/Logger.h"

View File

@ -23,13 +23,13 @@
#include "SummaryViewStep.h" #include "SummaryViewStep.h"
#include "Branding.h" #include "Branding.h"
#include "ExecutionViewStep.h"
#include "Settings.h" #include "Settings.h"
#include "ViewManager.h" #include "ViewManager.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "viewpages/ExecutionViewStep.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>