[libcalamares] [libcalamaresui] [calamares] Adjust to moved Dirs.h

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"

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"
 

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>

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
 {

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

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>

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"