Cleanup includes

src/fakerunner.cpp

@@ -33,4 +33,4 @@ FakeRunner::FakeRunner()
     qDBusRegisterMetaType<RemoteImage>();
 }
 
-#include "moc_fakerunner.cpp"
+#include "moc_fakerunner.cpp"

src/models/messagecontentmodel.cpp

@@ -11,7 +11,6 @@
 #include <Quotient/events/stickerevent.h>
 
 #include <KLocalizedString>
-#include <qlist.h>
 
 #ifndef Q_OS_ANDROID
 #include <KSyntaxHighlighting/Definition>

src/models/messagecontentmodel.h

@@ -11,8 +11,6 @@
 #include "enums/messagecomponenttype.h"
 #include "eventhandler.h"
 #include "itinerarymodel.h"
-#include "linkpreviewer.h"
-#include "neochatroom.h"
 
 struct MessageComponent {
     MessageComponentType::Type type = MessageComponentType::Other;

src/models/roomlistmodel.cpp

@@ -4,7 +4,7 @@
 #include "roomlistmodel.h"
 
 #include "eventhandler.h"
-#include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"

src/neochatroom.cpp

@@ -46,7 +46,6 @@
 #include "spacehierarchycache.h"
 #include "texthandler.h"
 #include "urlhelper.h"
-#include "utils.h"
 
 #ifndef Q_OS_ANDROID
 #include <KIO/Job>

src/runner.cpp

@@ -6,7 +6,6 @@
 #include <QDBusMetaType>
 
 #include "controller.h"
-#include "neochatroom.h"
 #include "roomlistmodel.h"
 #include "roommanager.h"
 #include "sortfilterroomlistmodel.h"
@@ -43,17 +42,6 @@ Runner::Runner()
     qDBusRegisterMetaType<RemoteImage>();
 }
 
-void Runner::setRoomListModel(RoomListModel *roomListModel)
-{
-    m_model->setSourceModel(roomListModel);
-    Q_EMIT roomListModelChanged();
-}
-
-RoomListModel *Runner::roomListModel() const
-{
-    return dynamic_cast<RoomListModel *>(m_model->sourceModel());
-}
-
 RemoteActions Runner::Actions()
 {
     return {};

src/runner.h

@@ -165,10 +165,6 @@ class Runner : public QObject, protected QDBusContext
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.krunner1")
-    QML_ELEMENT
-    QML_SINGLETON
-
-    Q_PROPERTY(RoomListModel *roomListModel READ roomListModel WRITE setRoomListModel NOTIFY roomListModelChanged)
 public:
     static Runner *create(QQmlEngine *engine, QJSEngine *)
     {
@@ -194,9 +190,6 @@ public:
      */
     Q_SCRIPTABLE void Run(const QString &id, const QString &actionId);
 
-    void setRoomListModel(RoomListModel *roomListModel);
-    RoomListModel *roomListModel() const;
-
 Q_SIGNALS:
     void roomListModelChanged();
 

src/spacehierarchycache.cpp

@@ -3,13 +3,14 @@
 
 #include "spacehierarchycache.h"
 
+#include <Quotient/csapi/space_hierarchy.h>
 #include <Quotient/qt_connection_util.h>
 
 #include <KConfigGroup>
 #include <KSharedConfig>
 
+#include "neochatconnection.h"
 #include "neochatroom.h"
-#include "neochatroomtype.h"
 #include "roomlistmodel.h"
 
 using namespace Quotient;

src/spacehierarchycache.h

@@ -10,15 +10,14 @@
 #include <QQmlEngine>
 #include <QString>
 
-#include <Quotient/csapi/space_hierarchy.h>
-
-#include "neochatconnection.h"
-
 namespace Quotient
 {
 class Room;
+class GetSpaceHierarchyJob;
 }
 
+class NeoChatConnection;
+
 /**
  * @class SpaceHierarchyCache
  *

src/texthandler.h

@@ -3,11 +3,8 @@
 
 #pragma once
 
-#include <QHash>
 #include <QObject>
-#include <QRegularExpression>
 #include <QString>
-#include <QStringList>
 
 #include "models/messagecontentmodel.h"
 #include "neochatroom.h"

src/windowcontroller.cpp

@@ -14,8 +14,14 @@
 #endif
 
 #include <KSharedConfig>
+
+#include <QQuickWindow>
 #include <QStandardPaths>
 
+#ifdef HAVE_WINDOWSYSTEM
+#include <KWindowEffects>
+#endif
+
 WindowController &WindowController::instance()
 {
     static WindowController instance;

src/windowcontroller.h

@@ -6,10 +6,7 @@
 #include <QObject>
 #include <QQmlEngine>
 #include <QQuickItem>
-#include <QQuickWindow>
+
-#ifdef HAVE_WINDOWSYSTEM
-#include <KWindowEffects>
-#endif
 /**
  * @class WindowController
  *