From 841ea9ff4875da20fb81ff251dbb9a0ef1ebda5c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Mar 2020 20:54:22 -0500
Subject: [PATCH] [libcalamares] Tidy up includes

- Remove commented-out includes
- Consistent punctuation
---
 src/libcalamares/utils/TestPaths.cpp             | 6 ------
 src/libcalamaresui/utils/ImageRegistry.cpp       | 2 +-
 src/libcalamaresui/viewpages/ExecutionViewStep.h | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp
index 2fd7b9c98..382305ad5 100644
--- a/src/libcalamares/utils/TestPaths.cpp
+++ b/src/libcalamares/utils/TestPaths.cpp
@@ -26,14 +26,8 @@
 #include "JobQueue.h"
 
 #include <QDir>
-// #include <QTemporaryFile>
-
 #include <QtTest/QtTest>
 
-// #include <fcntl.h>
-// #include <sys/stat.h>
-// #include <unistd.h>
-
 class TestPaths : public QObject
 {
     Q_OBJECT
diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp
index 1c3b9433e..a08bbfc7d 100644
--- a/src/libcalamaresui/utils/ImageRegistry.cpp
+++ b/src/libcalamaresui/utils/ImageRegistry.cpp
@@ -25,9 +25,9 @@
 
 #include "ImageRegistry.h"
 
+#include <QIcon>
 #include <QPainter>
 #include <QSvgRenderer>
-#include <qicon.h>
 
 static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
 
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.h b/src/libcalamaresui/viewpages/ExecutionViewStep.h
index 8c4174cdb..e797c3cb2 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.h
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.h
@@ -20,7 +20,7 @@
 #ifndef EXECUTIONVIEWSTEP_H
 #define EXECUTIONVIEWSTEP_H
 
-#include <viewpages/ViewStep.h>
+#include "ViewStep.h"
 
 #include <QStringList>