From ecbab34510f6f925ec4b03e02d24b1ceff4d2744 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 4 Feb 2018 11:38:50 +0100
Subject: Fix all krazy #include warnings

- "include own header first line"
- "put config.h in angle brackets line"
- "do not include QtModule/QtClass line"

`QElapsedTimer` was implicitly included by
kfileitemmodelsortalgorithm.h, now we need to explicitly include it in
kfileitemmodel.cpp.

We also need to explicitly link to `Qt5::Concurrent`, otherwise we
cannot `#include <QtConcurrentRun>`.
---
 src/kitemviews/kfileitemmodel.cpp                    | 1 +
 src/kitemviews/kitemlistviewaccessible.h             | 8 ++++----
 src/kitemviews/private/kfileitemmodelsortalgorithm.h | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/kitemviews')

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index a5422a7bf..8c736ccfe 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -31,6 +31,7 @@
 #include "private/kfileitemmodelsortalgorithm.h"
 #include "private/kfileitemmodeldirlister.h"
 
+#include <QElapsedTimer>
 #include <QMimeData>
 #include <QTimer>
 #include <QWidget>
diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h
index 674d98ee6..fdc3ff1a3 100644
--- a/src/kitemviews/kitemlistviewaccessible.h
+++ b/src/kitemviews/kitemlistviewaccessible.h
@@ -24,10 +24,10 @@
 
 #include "dolphin_export.h"
 
-#include <QtCore/qpointer.h>
-#include <qaccessible.h>
-#include <qaccessibleobject.h>
-#include <QtWidgets/qaccessiblewidget.h>
+#include <QAccessible>
+#include <QAccessibleObject>
+#include <QAccessibleWidget>
+#include <QPointer>
 
 class KItemListView;
 class KItemListContainer;
diff --git a/src/kitemviews/private/kfileitemmodelsortalgorithm.h b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
index 7c090db91..ff484a7e8 100644
--- a/src/kitemviews/private/kfileitemmodelsortalgorithm.h
+++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
@@ -22,7 +22,7 @@
 #ifndef KFILEITEMMODELSORTALGORITHM_H
 #define KFILEITEMMODELSORTALGORITHM_H
 
-#include <QtConcurrent/QtConcurrent>
+#include <QtConcurrentRun>
 
 #include <algorithm>
 
-- 
cgit v1.3