From 63b6d7ebe044c1d209c8919246edc8eea01cbf50 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 8 Jan 2024 20:41:59 +0100 Subject: [PATCH] Remove unused includes --- src/controller.cpp | 5 ----- src/matriximageprovider.cpp | 1 - src/models/actionsmodel.cpp | 1 - src/models/customemojimodel.cpp | 2 -- src/models/customemojimodel.h | 3 +-- src/models/devicesmodel.cpp | 1 - src/models/pushrulemodel.cpp | 1 - src/models/roomlistmodel.cpp | 4 ---- src/models/roomlistmodel.h | 2 -- src/models/serverlistmodel.cpp | 4 ++-- src/models/spacechildrenmodel.cpp | 2 +- src/models/spacetreeitem.cpp | 2 +- src/neochatroom.cpp | 13 ++----------- src/notificationsmanager.cpp | 1 - src/roommanager.cpp | 3 +-- src/roommanager.h | 1 - src/runner.cpp | 1 - src/spacehierarchycache.cpp | 1 - 18 files changed, 8 insertions(+), 40 deletions(-) diff --git a/src/controller.cpp b/src/controller.cpp index f79a2961d..d581636a5 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -7,10 +7,7 @@ #include #include -#include -#include -#include #include #include #include @@ -28,13 +25,11 @@ #include #include #include -#include #include "neochatconfig.h" #include "neochatroom.h" #include "notificationsmanager.h" #include "roommanager.h" -#include "windowcontroller.h" #if defined(Q_OS_WIN) || defined(Q_OS_MAC) #include "trayicon.h" diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp index 59b49aec0..7c180d2dc 100644 --- a/src/matriximageprovider.cpp +++ b/src/matriximageprovider.cpp @@ -12,7 +12,6 @@ #include -#include "controller.h" #include "neochatconnection.h" #include diff --git a/src/models/actionsmodel.cpp b/src/models/actionsmodel.cpp index 11da2f422..c6384ec1f 100644 --- a/src/models/actionsmodel.cpp +++ b/src/models/actionsmodel.cpp @@ -4,7 +4,6 @@ #include "actionsmodel.h" #include "chatbarcache.h" -#include "controller.h" #include "neochatroom.h" #include "roommanager.h" #include diff --git a/src/models/customemojimodel.cpp b/src/models/customemojimodel.cpp index aafcb4cf3..6ac142e53 100644 --- a/src/models/customemojimodel.cpp +++ b/src/models/customemojimodel.cpp @@ -6,10 +6,8 @@ #include #include -#include "controller.h" #include "emojimodel.h" -#include #include #include diff --git a/src/models/customemojimodel.h b/src/models/customemojimodel.h index c4b1e474e..51907c0c7 100644 --- a/src/models/customemojimodel.h +++ b/src/models/customemojimodel.h @@ -6,9 +6,8 @@ #include #include #include -#include -class NeoChatConnection; +#include "neochatconnection.h" struct CustomEmoji { QString name; // with :semicolons: diff --git a/src/models/devicesmodel.cpp b/src/models/devicesmodel.cpp index f03598544..f44692b0a 100644 --- a/src/models/devicesmodel.cpp +++ b/src/models/devicesmodel.cpp @@ -3,7 +3,6 @@ #include "devicesmodel.h" -#include "controller.h" #include "jobs/neochatdeletedevicejob.h" #include diff --git a/src/models/pushrulemodel.cpp b/src/models/pushrulemodel.cpp index 9615b10bf..d1e68dcad 100644 --- a/src/models/pushrulemodel.cpp +++ b/src/models/pushrulemodel.cpp @@ -11,7 +11,6 @@ #include #include -#include "controller.h" #include "neochatconfig.h" #include diff --git a/src/models/roomlistmodel.cpp b/src/models/roomlistmodel.cpp index b670b06b4..edd5c6e08 100644 --- a/src/models/roomlistmodel.cpp +++ b/src/models/roomlistmodel.cpp @@ -3,15 +3,12 @@ #include "roomlistmodel.h" -#include "controller.h" #include "eventhandler.h" #include "neochatconfig.h" #include "neochatroom.h" #include "roommanager.h" #include "spacehierarchycache.h" -#include - #include #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0) #ifndef Q_OS_ANDROID @@ -23,7 +20,6 @@ #include #include -#include using namespace Quotient; diff --git a/src/models/roomlistmodel.h b/src/models/roomlistmodel.h index 3c7d0ac05..329098cf0 100644 --- a/src/models/roomlistmodel.h +++ b/src/models/roomlistmodel.h @@ -3,8 +3,6 @@ #pragma once -#include - #include #include diff --git a/src/models/serverlistmodel.cpp b/src/models/serverlistmodel.cpp index ff48f8677..a0e8e97c1 100644 --- a/src/models/serverlistmodel.cpp +++ b/src/models/serverlistmodel.cpp @@ -3,8 +3,6 @@ #include "serverlistmodel.h" -#include "controller.h" - #include #include @@ -13,6 +11,8 @@ #include #include +#include "neochatconnection.h" + ServerListModel::ServerListModel(QObject *parent) : QAbstractListModel(parent) { diff --git a/src/models/spacechildrenmodel.cpp b/src/models/spacechildrenmodel.cpp index a7503ec67..6364fbcfc 100644 --- a/src/models/spacechildrenmodel.cpp +++ b/src/models/spacechildrenmodel.cpp @@ -7,7 +7,7 @@ #include #include -#include "controller.h" +#include "neochatconnection.h" SpaceChildrenModel::SpaceChildrenModel(QObject *parent) : QAbstractItemModel(parent) diff --git a/src/models/spacetreeitem.cpp b/src/models/spacetreeitem.cpp index ebc50c5df..21820304f 100644 --- a/src/models/spacetreeitem.cpp +++ b/src/models/spacetreeitem.cpp @@ -3,7 +3,7 @@ #include "spacetreeitem.h" -#include "controller.h" +#include "neochatconnection.h" SpaceTreeItem::SpaceTreeItem(NeoChatConnection *connection, SpaceTreeItem *parent, diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp index e6183b02e..4fd7e9dd3 100644 --- a/src/neochatroom.cpp +++ b/src/neochatroom.cpp @@ -4,15 +4,10 @@ #include "neochatroom.h" #include -#include -#include -#include -#include -#include -#include - #include #include +#include +#include #include #include @@ -35,13 +30,11 @@ #include #include #include -#include #include #include #include "chatbarcache.h" #include "clipboard.h" -#include "controller.h" #include "eventhandler.h" #include "events/joinrulesevent.h" #include "events/pollevent.h" @@ -53,8 +46,6 @@ #include "urlhelper.h" #include "utils.h" -#include -#include #ifndef Q_OS_ANDROID #include #include diff --git a/src/notificationsmanager.cpp b/src/notificationsmanager.cpp index 19a210d86..ce5f788f1 100644 --- a/src/notificationsmanager.cpp +++ b/src/notificationsmanager.cpp @@ -21,7 +21,6 @@ #endif #include "controller.h" -#include "neochatconfig.h" #include "neochatconnection.h" #include "neochatroom.h" #include "roommanager.h" diff --git a/src/roommanager.cpp b/src/roommanager.cpp index ff6b66723..ddf6992dd 100644 --- a/src/roommanager.cpp +++ b/src/roommanager.cpp @@ -5,11 +5,10 @@ #include "roommanager.h" #include "chatbarcache.h" -#include "controller.h" #include "enums/delegatetype.h" -#include "models/messageeventmodel.h" #include "models/timelinemodel.h" #include "neochatconfig.h" +#include "neochatconnection.h" #include "neochatroom.h" #include diff --git a/src/roommanager.h b/src/roommanager.h index 41e359030..12cbb1648 100644 --- a/src/roommanager.h +++ b/src/roommanager.h @@ -13,7 +13,6 @@ #include "chatdocumenthandler.h" #include "enums/delegatetype.h" #include "models/mediamessagefiltermodel.h" -#include "models/messageeventmodel.h" #include "models/messagefiltermodel.h" #include "models/timelinemodel.h" diff --git a/src/runner.cpp b/src/runner.cpp index be895b684..bef32b917 100644 --- a/src/runner.cpp +++ b/src/runner.cpp @@ -5,7 +5,6 @@ #include -#include "controller.h" #include "neochatroom.h" #include "roommanager.h" #include "windowcontroller.h" diff --git a/src/spacehierarchycache.cpp b/src/spacehierarchycache.cpp index 5556b510e..db8331745 100644 --- a/src/spacehierarchycache.cpp +++ b/src/spacehierarchycache.cpp @@ -6,7 +6,6 @@ #include #include -#include "controller.h" #include "neochatroom.h" using namespace Quotient;