From 16a460adff38e7043e5cdd7347c7be97616beda5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 10 Jan 2020 11:56:30 +0100
Subject: [PATCH] [libcalamaresui] Move ExecutionViewStep where it belongs

 - viewpages/ collects the ViewStep implementations
 - chase header moving and tidy some #includes
---
 src/libcalamaresui/CMakeLists.txt                        | 2 +-
 src/libcalamaresui/ViewManager.cpp                       | 7 +++----
 src/libcalamaresui/modulesystem/ModuleManager.cpp        | 6 +++---
 src/libcalamaresui/{ => viewpages}/ExecutionViewStep.cpp | 4 ++--
 src/libcalamaresui/{ => viewpages}/ExecutionViewStep.h   | 0
 src/modules/summary/SummaryPage.cpp                      | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)
 rename src/libcalamaresui/{ => viewpages}/ExecutionViewStep.cpp (99%)
 rename src/libcalamaresui/{ => viewpages}/ExecutionViewStep.h (100%)

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index a9d31c2c3..c315a6b3e 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -18,6 +18,7 @@ set( calamaresui_SOURCES
     utils/Paste.cpp
 
     viewpages/BlankViewStep.cpp
+    viewpages/ExecutionViewStep.cpp
     viewpages/ViewStep.cpp
 
     widgets/ClickableLabel.cpp
@@ -25,7 +26,6 @@ set( calamaresui_SOURCES
     widgets/WaitingWidget.cpp
     ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 
-    ExecutionViewStep.cpp
     Branding.cpp
     ViewManager.cpp
 )
diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 68d918971..4721370b9 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -21,17 +21,16 @@
 
 #include "ViewManager.h"
 
-#include "viewpages/BlankViewStep.h"
-#include "viewpages/ViewStep.h"
-
 #include "Branding.h"
-#include "ExecutionViewStep.h"
 #include "JobQueue.h"
 #include "Settings.h"
 
 #include "utils/Logger.h"
 #include "utils/Paste.h"
 #include "utils/Retranslator.h"
+#include "viewpages/BlankViewStep.h"
+#include "viewpages/ViewStep.h"
+#include "viewpages/ExecutionViewStep.h"
 
 #include <QApplication>
 #include <QBoxLayout>
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 33b638e64..8591a558f 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -19,7 +19,6 @@
 
 #include "ModuleManager.h"
 
-#include "ExecutionViewStep.h"
 #include "Module.h"
 #include "RequirementsChecker.h"
 #include "Settings.h"
@@ -27,6 +26,7 @@
 
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
+#include "viewpages/ExecutionViewStep.h"
 
 #include <QApplication>
 #include <QDir>
@@ -131,9 +131,9 @@ ModuleManager::doInit()
             cDebug() << "ModuleManager module search path does not exist:" << path;
         }
     }
-    // At this point m_availableDescriptorsByModuleName is filled with 
+    // At this point m_availableDescriptorsByModuleName is filled with
     // the modules that were found in the search paths.
-    cDebug() << "Found" 
+    cDebug() << "Found"
         << m_availableDescriptorsByModuleName.count() << "modules"
         << m_moduleDirectoriesByModuleName.count() << "names";
     emit initDone();
diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
similarity index 99%
rename from src/libcalamaresui/ExecutionViewStep.cpp
rename to src/libcalamaresui/viewpages/ExecutionViewStep.cpp
index 501995c07..e0921910d 100644
--- a/src/libcalamaresui/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
@@ -18,16 +18,16 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <ExecutionViewStep.h>
+#include "ExecutionViewStep.h"
 
 #include "Branding.h"
 #include "Job.h"
 #include "JobQueue.h"
 #include "Settings.h"
 #include "ViewManager.h"
+
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
diff --git a/src/libcalamaresui/ExecutionViewStep.h b/src/libcalamaresui/viewpages/ExecutionViewStep.h
similarity index 100%
rename from src/libcalamaresui/ExecutionViewStep.h
rename to src/libcalamaresui/viewpages/ExecutionViewStep.h
diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index 61a9c2ec2..7114f27ee 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -23,13 +23,13 @@
 #include "SummaryViewStep.h"
 
 #include "Branding.h"
-#include "ExecutionViewStep.h"
 #include "Settings.h"
 #include "ViewManager.h"
 
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
+#include "viewpages/ExecutionViewStep.h"
 
 #include <QBoxLayout>
 #include <QLabel>