From 46916b34d454d2ed75025e4799f04e1132b96fc7 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Mon, 19 Aug 2024 22:33:36 +0200
Subject: [PATCH] Remove duplicate headers from headers/cpp

---
 src/controller.cpp                 | 2 --
 src/eventhandler.cpp               | 2 --
 src/models/messagecontentmodel.cpp | 4 ----
 src/models/messageeventmodel.cpp   | 6 ------
 src/models/messagefiltermodel.cpp  | 2 --
 src/models/pushrulemodel.cpp       | 1 -
 src/models/reactionmodel.cpp       | 3 ---
 src/models/searchmodel.cpp         | 1 -
 src/models/spacechildrenmodel.cpp  | 1 -
 src/models/threadmodel.cpp         | 2 --
 src/models/userlistmodel.cpp       | 1 -
 src/neochatconnection.cpp          | 1 -
 src/registration.cpp               | 1 -
 src/roommanager.cpp                | 3 ---
 src/threepidaddhelper.cpp          | 1 -
 src/threepidbindhelper.cpp         | 1 -
 16 files changed, 32 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index e54f13e9b..fd78b562d 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -13,13 +13,11 @@
 
 #include <signal.h>
 
-#include <Quotient/accountregistry.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index 1d67653ec..e5eb71b63 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -7,14 +7,12 @@
 
 #include <KLocalizedString>
 
-#include <Quotient/eventitem.h>
 #include <Quotient/events/encryptionevent.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
 #include <Quotient/events/roomcanonicalaliasevent.h>
 #include <Quotient/events/roommemberevent.h>
-#include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/events/simplestateevents.h>
 #include <Quotient/events/stickerevent.h>
diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp
index b99c77cb1..7d9232465 100644
--- a/src/models/messagecontentmodel.cpp
+++ b/src/models/messagecontentmodel.cpp
@@ -3,7 +3,6 @@
 
 #include "messagecontentmodel.h"
 #include "neochatconfig.h"
-#include "neochatroommember.h"
 
 #include <QImageReader>
 
@@ -20,10 +19,7 @@
 #endif
 
 #include "chatbarcache.h"
-#include "enums/messagecomponenttype.h"
-#include "eventhandler.h"
 #include "filetype.h"
-#include "itinerarymodel.h"
 #include "linkpreviewer.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index e5327cab4..d55e3d2fa 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -22,15 +22,9 @@
 #include "enums/delegatetype.h"
 #include "eventhandler.h"
 #include "events/pollevent.h"
-#include "linkpreviewer.h"
-#include "messagecontentmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/reactionmodel.h"
-#include "neochatroom.h"
-#include "neochatroommember.h"
-#include "readmarkermodel.h"
 #include "texthandler.h"
-#include "threadmodel.h"
 
 using namespace Quotient;
 
diff --git a/src/models/messagefiltermodel.cpp b/src/models/messagefiltermodel.cpp
index 6286ab922..babd35b21 100644
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -8,10 +8,8 @@
 
 #include "enums/delegatetype.h"
 #include "messagecontentmodel.h"
-#include "messageeventmodel.h"
 #include "neochatconfig.h"
 #include "neochatroommember.h"
-#include "timelinemodel.h"
 
 using namespace Quotient;
 
diff --git a/src/models/pushrulemodel.cpp b/src/models/pushrulemodel.cpp
index 36c72ad17..8551b07c4 100644
--- a/src/models/pushrulemodel.cpp
+++ b/src/models/pushrulemodel.cpp
@@ -11,7 +11,6 @@
 #include <Quotient/jobs/basejob.h>
 
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 
 #include <KLazyLocalizedString>
 
diff --git a/src/models/reactionmodel.cpp b/src/models/reactionmodel.cpp
index 6a4260ede..6b938ce47 100644
--- a/src/models/reactionmodel.cpp
+++ b/src/models/reactionmodel.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "reactionmodel.h"
-#include "neochatroom.h"
 
 #include <QDebug>
 #include <QFont>
@@ -15,8 +14,6 @@
 
 #include <KLocalizedString>
 
-#include <Quotient/roommember.h>
-
 ReactionModel::ReactionModel(const Quotient::RoomMessageEvent *event, NeoChatRoom *room)
     : QAbstractListModel(nullptr)
     , m_room(room)
diff --git a/src/models/searchmodel.cpp b/src/models/searchmodel.cpp
index bbd5243dd..5a45e0d43 100644
--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -7,7 +7,6 @@
 #include "eventhandler.h"
 #include "models/messagecontentmodel.h"
 #include "neochatroom.h"
-#include "neochatroommember.h"
 
 #include <QGuiApplication>
 
diff --git a/src/models/spacechildrenmodel.cpp b/src/models/spacechildrenmodel.cpp
index 1ce120336..3ce334ebb 100644
--- a/src/models/spacechildrenmodel.cpp
+++ b/src/models/spacechildrenmodel.cpp
@@ -7,7 +7,6 @@
 #include <Quotient/room.h>
 
 #include "neochatconnection.h"
-#include "neochatroom.h"
 
 SpaceChildrenModel::SpaceChildrenModel(QObject *parent)
     : QAbstractItemModel(parent)
diff --git a/src/models/threadmodel.cpp b/src/models/threadmodel.cpp
index 6f80d88bb..542b0c0c3 100644
--- a/src/models/threadmodel.cpp
+++ b/src/models/threadmodel.cpp
@@ -3,7 +3,6 @@
 
 #include "threadmodel.h"
 
-#include <Quotient/csapi/relations.h>
 #include <Quotient/events/event.h>
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/jobs/basejob.h>
@@ -11,7 +10,6 @@
 #include <memory>
 
 #include "eventhandler.h"
-#include "messagecontentmodel.h"
 #include "neochatroom.h"
 
 ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
diff --git a/src/models/userlistmodel.cpp b/src/models/userlistmodel.cpp
index ba3a4cbf5..74e405f0b 100644
--- a/src/models/userlistmodel.cpp
+++ b/src/models/userlistmodel.cpp
@@ -7,7 +7,6 @@
 
 #include <Quotient/avatar.h>
 #include <Quotient/events/roompowerlevelsevent.h>
-#include <Quotient/room.h>
 
 #include "enums/powerlevel.h"
 #include "neochatroom.h"
diff --git a/src/neochatconnection.cpp b/src/neochatconnection.cpp
index 67c77b745..707628217 100644
--- a/src/neochatconnection.cpp
+++ b/src/neochatconnection.cpp
@@ -16,7 +16,6 @@
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qt6keychain/keychain.h>
diff --git a/src/registration.cpp b/src/registration.cpp
index f2160905f..759387fff 100644
--- a/src/registration.cpp
+++ b/src/registration.cpp
@@ -7,7 +7,6 @@
 #include <QTcpSocket>
 #include <QThread>
 
-#include <Quotient/csapi/registration.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 
diff --git a/src/roommanager.cpp b/src/roommanager.cpp
index 8bbd690cd..a8a2fe223 100644
--- a/src/roommanager.cpp
+++ b/src/roommanager.cpp
@@ -6,12 +6,9 @@
 
 #include "chatbarcache.h"
 #include "controller.h"
-#include "eventhandler.h"
-#include "models/timelinemodel.h"
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
-#include "neochatroommember.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 
diff --git a/src/threepidaddhelper.cpp b/src/threepidaddhelper.cpp
index e2f72db6d..3aa07e3a0 100644
--- a/src/threepidaddhelper.cpp
+++ b/src/threepidaddhelper.cpp
@@ -6,7 +6,6 @@
 #include <Quotient/converters.h>
 #include <Quotient/csapi/definitions/auth_data.h>
 #include <Quotient/csapi/definitions/request_msisdn_validation.h>
-#include <Quotient/jobs/basejob.h>
 
 #include "jobs/neochatadd3pidjob.h"
 #include "neochatconnection.h"
diff --git a/src/threepidbindhelper.cpp b/src/threepidbindhelper.cpp
index 6f6ba3f0e..d35a82483 100644
--- a/src/threepidbindhelper.cpp
+++ b/src/threepidbindhelper.cpp
@@ -9,7 +9,6 @@
 #include <Quotient/csapi/definitions/auth_data.h>
 #include <Quotient/csapi/definitions/request_msisdn_validation.h>
 #include <Quotient/csapi/openid.h>
-#include <Quotient/jobs/basejob.h>
 #include <Quotient/networkaccessmanager.h>
 
 #include <KLocalizedString>