From 4fec6731bae097a160404b56de0612abc4a87e80 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 15 Apr 2019 09:05:02 -0400
Subject: [PATCH] [calamares] [libcalamaresui] Improve includes

 - avoid useless ../
 - sort alphabetically and by kind
---
 src/calamares/progresstree/ProgressTreeDelegate.cpp | 9 +++++----
 src/libcalamaresui/viewpages/AbstractPage.h         | 2 +-
 src/libcalamaresui/viewpages/ViewStep.h             | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 8838d9b25..9c6a400f6 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -19,12 +19,13 @@
 
 #include "ProgressTreeDelegate.h"
 
-#include "../CalamaresApplication.h"
-#include "../CalamaresWindow.h"
-#include "ViewStepItem.h"
+#include "Branding.h"
+#include "CalamaresApplication.h"
+#include "CalamaresWindow.h"
 #include "ProgressTreeModel.h"
 #include "ViewManager.h"
-#include "Branding.h"
+#include "ViewStepItem.h"
+
 #include "utils/CalamaresUtilsGui.h"
 
 #include <QAbstractItemView>
diff --git a/src/libcalamaresui/viewpages/AbstractPage.h b/src/libcalamaresui/viewpages/AbstractPage.h
index a4a2aea75..325f1ddf2 100644
--- a/src/libcalamaresui/viewpages/AbstractPage.h
+++ b/src/libcalamaresui/viewpages/AbstractPage.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 
-#include "../UiDllMacro.h"
+#include "UiDllMacro.h"
 
 namespace Calamares
 {
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index 0010f407e..631c41314 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -21,10 +21,12 @@
 #define VIEWSTEP_H
 
 #include <QObject>
+#include <QSize>
+
+#include "Typedefs.h"
+#include "UiDllMacro.h"
 
 #include "modulesystem/Requirement.h"
-#include "../UiDllMacro.h"
-#include "Typedefs.h"
 
 namespace Calamares
 {