From a08d017c02d7d8c55ac18e4a2f5f25538d42c7c7 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Wed, 4 Nov 2020 20:25:52 +0100
Subject: [PATCH] Normalize includes

---
 src/controller.cpp          | 14 +++++++-------
 src/imageclipboard.cpp      |  2 +-
 src/matriximageprovider.cpp |  4 ++--
 src/matriximageprovider.h   |  6 +++---
 src/messageeventmodel.cpp   |  4 ++--
 src/messageeventmodel.h     |  2 +-
 src/roomlistmodel.cpp       |  7 +++----
 src/roomlistmodel.h         |  2 +-
 src/userlistmodel.cpp       |  4 ++--
 src/userlistmodel.h         |  2 +-
 10 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index 2f7c87d04..8ff25128b 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -16,13 +16,13 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QSysInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QTimer>
+#include <QDebug>
+#include <QDir>
+#include <QElapsedTimer>
+#include <QFileInfo>
+#include <QStandardPaths>
+#include <QStringBuilder>
+#include <QTimer>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QMovie>
diff --git a/src/imageclipboard.cpp b/src/imageclipboard.cpp
index 28ba13e80..f11e28451 100644
--- a/src/imageclipboard.cpp
+++ b/src/imageclipboard.cpp
@@ -9,7 +9,7 @@
 #include <QFileInfo>
 #include <QGuiApplication>
 #include <QUrl>
-#include <QtDebug>
+#include <QDebug>
 
 ImageClipboard::ImageClipboard(QObject *parent)
     : QObject(parent)
diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp
index 884fd9e74..a90bf03c7 100644
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -9,8 +9,8 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QStandardPaths>
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QThread>
 
 using Quotient::BaseJob;
 
diff --git a/src/matriximageprovider.h b/src/matriximageprovider.h
index 5b183d927..6cb7df20c 100644
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -8,13 +8,13 @@
 #define MatrixImageProvider_H
 #pragma once
 
-#include <QtQuick/QQuickAsyncImageProvider>
+#include <QQuickAsyncImageProvider>
 
 #include <connection.h>
 #include <jobs/mediathumbnailjob.h>
 
-#include <QtCore/QAtomicPointer>
-#include <QtCore/QReadWriteLock>
+#include <QAtomicPointer>
+#include <QReadWriteLock>
 
 namespace Quotient
 {
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index af1b317a3..fe72fb898 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -9,8 +9,8 @@
 #include <settings.h>
 #include <user.h>
 
-#include <QtCore/QDebug>
-#include <QtQml> // for qmlRegisterType()
+#include <QDebug>
+#include <QQmlEngine> // for qmlRegisterType()
 
 #include "utils.h"
 
diff --git a/src/messageeventmodel.h b/src/messageeventmodel.h
index b0f5a6d0a..c78965e96 100644
--- a/src/messageeventmodel.h
+++ b/src/messageeventmodel.h
@@ -1,7 +1,7 @@
 #ifndef MESSAGEEVENTMODEL_H
 #define MESSAGEEVENTMODEL_H
 
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 #include "room.h"
 #include "spectralroom.h"
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index 5517252cb..446c6cae3 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -6,10 +6,9 @@
 #include "events/roomevent.h"
 
 #include <QStandardPaths>
-#include <QtCore/QDebug>
-#include <QtGui/QBrush>
-#include <QtGui/QColor>
-#include <QtQuick>
+#include <QDebug>
+#include <QBrush>
+#include <QColor>
 
 RoomListModel::RoomListModel(QObject *parent)
     : QAbstractListModel(parent)
diff --git a/src/roomlistmodel.h b/src/roomlistmodel.h
index 7bfcff5d0..e2640130f 100644
--- a/src/roomlistmodel.h
+++ b/src/roomlistmodel.h
@@ -6,7 +6,7 @@
 #include "room.h"
 #include "spectralroom.h"
 
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 using namespace Quotient;
 
diff --git a/src/userlistmodel.cpp b/src/userlistmodel.cpp
index 33826fc13..cb0c3d53e 100644
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -7,8 +7,8 @@
 #include "events/roompowerlevelsevent.h"
 
 #include <QElapsedTimer>
-#include <QtCore/QDebug>
-#include <QtGui/QPixmap>
+#include <QDebug>
+#include <QPixmap>
 
 #include "spectraluser.h"
 
diff --git a/src/userlistmodel.h b/src/userlistmodel.h
index 8ba9e015f..4036f37e7 100644
--- a/src/userlistmodel.h
+++ b/src/userlistmodel.h
@@ -4,7 +4,7 @@
 #include "room.h"
 
 #include <QObject>
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 namespace Quotient
 {