From ac095d9ed0f004e719ae7a3da0f60e399f4887b8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 29 Apr 2019 06:27:31 -0400
Subject: [PATCH] [libcalamares] [libcalamaresui] [calamares] Adjust to moved
 Dirs.h

---
 src/calamares/CalamaresApplication.cpp     |  1 +
 src/calamares/main.cpp                     |  2 +-
 src/libcalamares/PythonHelper.cpp          |  2 +-
 src/libcalamares/Settings.cpp              |  5 +++--
 src/libcalamares/utils/Logger.cpp          |  2 +-
 src/libcalamaresui/ExecutionViewStep.cpp   |  4 +++-
 src/libcalamaresui/modulesystem/Module.cpp | 15 ++++++++-------
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 0fd307548..81ec2d160 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -28,6 +28,7 @@
 #include "modulesystem/ModuleManager.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/CalamaresUtilsSystem.h"
+#include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "JobQueue.h"
 #include "Branding.h"
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index e2b5da8bf..5ddda33c6 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -22,7 +22,7 @@
 
 #include "CalamaresConfig.h"
 #include "kdsingleapplicationguard/kdsingleapplicationguard.h"
-#include "utils/CalamaresUtils.h"
+#include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "CalamaresConfig.h"
 
diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index d6001055e..3c4d1cca6 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -19,7 +19,7 @@
 
 #include "PythonHelper.h"
 
-#include "utils/CalamaresUtils.h"
+#include "utils/Dirs.h"
 #include "utils/Logger.h"
 
 #include <QDir>
diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 1ba58ccdf..0b12d87fb 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -21,7 +21,8 @@
 
 #include "Settings.h"
 
-#include "utils/CalamaresUtils.h"
+// #include "utils/CalamaresUtils.h"
+#include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
@@ -275,7 +276,7 @@ Settings::disableCancel() const
 {
     return m_disableCancel;
 }
-    
+
 bool
 Settings::dontCancel() const
 {
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index cbe711698..433e01fbb 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -30,7 +30,7 @@
 #include <QTime>
 #include <QVariant>
 
-#include "utils/CalamaresUtils.h"
+#include "utils/Dirs.h"
 #include "CalamaresVersion.h"
 
 #define LOGFILE_SIZE 1024 * 256
diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp
index b505102a4..2010bf120 100644
--- a/src/libcalamaresui/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/ExecutionViewStep.cpp
@@ -26,10 +26,12 @@
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
 #include "Settings.h"
+#include "ViewManager.h"
+
 #include "utils/CalamaresUtilsGui.h"
+#include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
-#include "ViewManager.h"
 
 #include <QDir>
 #include <QLabel>
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index de2cb79a5..133ee5438 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -19,14 +19,15 @@
 
 #include "Module.h"
 
-#include "ProcessJobModule.h"
-#include "CppJobModule.h"
-#include "ViewModule.h"
-#include "utils/CalamaresUtils.h"
-#include "utils/Yaml.h"
-#include "utils/Logger.h"
-#include "Settings.h"
 #include "CalamaresConfig.h"
+#include "CppJobModule.h"
+#include "ProcessJobModule.h"
+#include "Settings.h"
+#include "ViewModule.h"
+
+#include "utils/Dirs.h"
+#include "utils/Logger.h"
+#include "utils/Yaml.h"
 
 #ifdef WITH_PYTHON
 #include "PythonJobModule.h"