Normalize includes

src/controller.cpp

@@ -16,13 +16,13 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QSysInfo>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include <QtCore/QDir>
+#include <QDir>
-#include <QtCore/QElapsedTimer>
+#include <QElapsedTimer>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
-#include <QtCore/QStandardPaths>
+#include <QStandardPaths>
-#include <QtCore/QStringBuilder>
+#include <QStringBuilder>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QMovie>

src/imageclipboard.cpp

@@ -9,7 +9,7 @@
 #include <QFileInfo>
 #include <QGuiApplication>
 #include <QUrl>
-#include <QtDebug>
+#include <QDebug>
 
 ImageClipboard::ImageClipboard(QObject *parent)
     : QObject(parent)

src/matriximageprovider.cpp

@@ -9,8 +9,8 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QStandardPaths>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include <QtCore/QThread>
+#include <QThread>
 
 using Quotient::BaseJob;
 

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 <QAtomicPointer>
-#include <QtCore/QReadWriteLock>
+#include <QReadWriteLock>
 
 namespace Quotient
 {

src/messageeventmodel.cpp

@@ -9,8 +9,8 @@
 #include <settings.h>
 #include <user.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
-#include <QtQml> // for qmlRegisterType()
+#include <QQmlEngine> // for qmlRegisterType()
 
 #include "utils.h"
 

src/messageeventmodel.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGEEVENTMODEL_H
 #define MESSAGEEVENTMODEL_H
 
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 #include "room.h"
 #include "spectralroom.h"

src/roomlistmodel.cpp

@@ -6,10 +6,9 @@
 #include "events/roomevent.h"
 
 #include <QStandardPaths>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include <QtGui/QBrush>
+#include <QBrush>
-#include <QtGui/QColor>
+#include <QColor>
-#include <QtQuick>
 
 RoomListModel::RoomListModel(QObject *parent)
     : QAbstractListModel(parent)

src/roomlistmodel.h

@@ -6,7 +6,7 @@
 #include "room.h"
 #include "spectralroom.h"
 
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 using namespace Quotient;
 

src/userlistmodel.cpp

@@ -7,8 +7,8 @@
 #include "events/roompowerlevelsevent.h"
 
 #include <QElapsedTimer>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include <QtGui/QPixmap>
+#include <QPixmap>
 
 #include "spectraluser.h"
 

src/userlistmodel.h

@@ -4,7 +4,7 @@
 #include "room.h"
 
 #include <QObject>
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 
 namespace Quotient
 {