Remove Unnecessary Includes in Headers (#4275)

* refactor: remove unnecessary includes in headers * fix: formatting * chore: changelog * fix: scrollbar * fix: suggestions and old appbase remains * fix: suggestion * fix: missing Qt forward declarations * fix: another qt include * fix: includes for precompiled-headers=off * Add missing `<memory>` includes * Add missing `#pragma once` * Fix tests Co-authored-by: Rasmus Karlsson <[email protected]>
Chatterino · Dec 31, 2022 · 1043f9f · 1043f9f
1 parent f04c4c7
commit 1043f9f
Show file tree

Hide file tree

Showing 239 changed files with 871 additions and 544 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@
 - Dev: Ignore `WM_SHOWWINDOW` hide events, causing fewer attempted rescales. (#4198)
 - Dev: Migrated to C++ 20 (#4252, #4257)
 - Dev: Enable LTO for main branch builds. (#4258, #4260)
-- Dev: Removed unused include directives. (#4266)
+- Dev: Removed unused include directives. (#4266, #4275)
 - Dev: Removed TooltipPreviewImage. (#4268)
 - Dev: Removed unused operators in `Image` (#4267)
 

diff --git a/src/Application.cpp b/src/Application.cpp
@@ -4,39 +4,42 @@
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/hotkeys/HotkeyController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/notifications/NotificationController.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "debug/AssertInGuiThread.hpp"
+#include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "providers/bttv/BttvEmotes.hpp"
 #include "providers/chatterino/ChatterinoBadges.hpp"
 #include "providers/ffz/FfzBadges.hpp"
-#include "providers/ffz/FfzEmotes.hpp"
 #include "providers/irc/Irc2.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 #include "providers/seventv/SeventvBadges.hpp"
-#include "providers/seventv/SeventvEmotes.hpp"
 #include "providers/seventv/SeventvEventAPI.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
+#include "providers/twitch/PubSubActions.hpp"
 #include "providers/twitch/PubSubManager.hpp"
+#include "providers/twitch/PubSubMessages.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Fonts.hpp"
+#include "singletons/helper/LoggingChannel.hpp"
 #include "singletons/Logging.hpp"
-#include "singletons/NativeMessaging.hpp"
 #include "singletons/Paths.hpp"
-#include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/Toasts.hpp"
 #include "singletons/Updates.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
 #include "util/PostToThread.hpp"
-#include "util/RapidjsonHelpers.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/Window.hpp"

diff --git a/src/Application.hpp b/src/Application.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
 #include "singletons/NativeMessaging.hpp"
 
@@ -25,7 +24,6 @@ class Theme;
 class WindowManager;
 class Logging;
 class Paths;
-class AccountManager;
 class Emotes;
 class IEmotes;
 class Settings;

diff --git a/src/BaseSettings.hpp b/src/BaseSettings.hpp
@@ -1,5 +1,4 @@
-#ifndef AB_SETTINGS_H
-#define AB_SETTINGS_H
+#pragma once
 
 #include "common/ChatterinoSetting.hpp"
 
@@ -46,8 +45,3 @@ Settings *getSettings();
 AB_SETTINGS_CLASS *getABSettings();
 
 }  // namespace chatterino
-
-#ifdef CHATTERINO
-#    include "singletons/Settings.hpp"
-#endif
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -70,6 +70,10 @@ set(SOURCE_FILES
 
         controllers/filters/FilterModel.cpp
         controllers/filters/FilterModel.hpp
+        controllers/filters/FilterRecord.cpp
+        controllers/filters/FilterRecord.hpp
+        controllers/filters/FilterSet.cpp
+        controllers/filters/FilterSet.hpp
         controllers/filters/parser/FilterParser.cpp
         controllers/filters/parser/FilterParser.hpp
         controllers/filters/parser/Tokenizer.cpp
@@ -188,8 +192,6 @@ set(SOURCE_FILES
 
         providers/bttv/BttvEmotes.cpp
         providers/bttv/BttvEmotes.hpp
-        providers/bttv/LoadBttvChannelEmote.cpp
-        providers/bttv/LoadBttvChannelEmote.hpp
 
         providers/chatterino/ChatterinoBadges.cpp
         providers/chatterino/ChatterinoBadges.hpp
@@ -330,6 +332,7 @@ set(SOURCE_FILES
         util/AttachToConsole.hpp
         util/Clipboard.cpp
         util/Clipboard.hpp
+        util/ConcurrentMap.hpp
         util/DebugCount.cpp
         util/DebugCount.hpp
         util/DisplayBadge.cpp
@@ -356,6 +359,7 @@ set(SOURCE_FILES
         util/RatelimitBucket.hpp
         util/SampleData.cpp
         util/SampleData.hpp
+        util/SharedPtrElementLess.hpp
         util/SplitCommand.cpp
         util/SplitCommand.hpp
         util/StreamLink.cpp

diff --git a/src/common/ChannelChatters.cpp b/src/common/ChannelChatters.cpp
@@ -1,9 +1,12 @@
 #include "ChannelChatters.hpp"
 
+#include "common/Channel.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 
+#include <QColor>
+
 namespace chatterino {
 
 ChannelChatters::ChannelChatters(Channel &channel)

diff --git a/src/common/ChannelChatters.hpp b/src/common/ChannelChatters.hpp
@@ -1,15 +1,18 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "common/ChatterSet.hpp"
 #include "common/UniqueAccess.hpp"
 #include "lrucache/lrucache.hpp"
 #include "util/QStringHash.hpp"
 
+#include <QColor>
+#include <QObject>
 #include <QRgb>
 
 namespace chatterino {
 
+class Channel;
+
 class ChannelChatters
 {
 public:

diff --git a/src/common/Common.hpp b/src/common/Common.hpp
@@ -1,9 +1,5 @@
 #pragma once
 
-#include "common/Aliases.hpp"
-#include "common/Outcome.hpp"
-#include "common/ProviderId.hpp"
-
 #include <boost/optional.hpp>
 #include <boost/preprocessor.hpp>
 #include <QString>
@@ -20,11 +16,6 @@ enum class HighlightState {
     NewMessage,
 };
 
-inline QString qS(const std::string &string)
-{
-    return QString::fromStdString(string);
-}
-
 const Qt::KeyboardModifiers showSplitOverlayModifiers =
     Qt::ControlModifier | Qt::AltModifier;
 const Qt::KeyboardModifiers showAddSplitRegions =

diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "common/ChatterSet.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "messages/Emote.hpp"
 #include "providers/twitch/TwitchAccount.hpp"

diff --git a/src/common/DownloadManager.hpp b/src/common/DownloadManager.hpp
@@ -3,9 +3,7 @@
 #include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QObject>
-#include <QStringList>
 
 namespace chatterino {
 

diff --git a/src/common/LinkParser.hpp b/src/common/LinkParser.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QRegularExpressionMatch>
 #include <QString>
 
 namespace chatterino {

diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/NetworkCommon.hpp"
-#include "common/NetworkResult.hpp"
 
 #include <QHttpMultiPart>
 

diff --git a/src/common/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp
@@ -10,6 +10,12 @@
 
 namespace chatterino {
 
+template <typename T>
+class SignalVector;
+
+template <typename T>
+struct SignalVectorItemEvent;
+
 template <typename TVectorItem>
 class SignalVectorModel : public QAbstractTableModel,
                           pajlada::Signals::SignalHolder

diff --git a/src/controllers/accounts/AccountController.cpp b/src/controllers/accounts/AccountController.cpp
@@ -3,6 +3,7 @@
 #include "controllers/accounts/Account.hpp"
 #include "controllers/accounts/AccountModel.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "util/SharedPtrElementLess.hpp"
 
 namespace chatterino {
 

diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp
@@ -3,7 +3,6 @@
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
-#include "util/SharedPtrElementLess.hpp"
 
 #include <QObject>
 

diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/accounts/Account.hpp"
 #include "util/QStringHash.hpp"
 
 #include <unordered_map>

diff --git a/src/controllers/commands/CommandContext.hpp b/src/controllers/commands/CommandContext.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "common/Channel.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
-
 #include <QStringList>
 
+#include <memory>
+
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+class TwitchChannel;
+
 struct CommandContext {
     QStringList words;
 

diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
@@ -1,21 +1,25 @@
-#include "CommandController.hpp"
+#include "controllers/commands/CommandController.hpp"
 
 #include "Application.hpp"
 #include "common/Env.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "common/SignalVector.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/builtin/twitch/ChatSettings.hpp"
 #include "controllers/commands/Command.hpp"
+#include "controllers/commands/CommandContext.hpp"
 #include "controllers/commands/CommandModel.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "messages/MessageElement.hpp"
+#include "messages/MessageThread.hpp"
 #include "providers/irc/IrcChannel2.hpp"
 #include "providers/irc/IrcServer.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -35,6 +39,7 @@
 #include "util/Twitch.hpp"
 #include "widgets/dialogs/ReplyThreadPopup.hpp"
 #include "widgets/dialogs/UserInfoPopup.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 #include "widgets/Window.hpp"

diff --git a/src/controllers/commands/CommandController.hpp b/src/controllers/commands/CommandController.hpp
@@ -1,11 +1,8 @@
 #pragma once
 
-#include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
-#include "controllers/commands/Command.hpp"
-#include "controllers/commands/CommandContext.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
+#include "util/QStringHash.hpp"
 
 #include <pajlada/settings.hpp>
 #include <QMap>
@@ -20,8 +17,12 @@ namespace chatterino {
 class Settings;
 class Paths;
 class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+struct Message;
 
+struct Command;
 class CommandModel;
+struct CommandContext;
 
 class CommandController final : public Singleton
 {

diff --git a/src/controllers/commands/CommandModel.cpp b/src/controllers/commands/CommandModel.cpp
@@ -1,5 +1,7 @@
-#include "CommandModel.hpp"
+#include "controllers/commands/CommandModel.hpp"
 
+#include "common/SignalVector.hpp"
+#include "controllers/commands/Command.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

diff --git a/src/controllers/commands/CommandModel.hpp b/src/controllers/commands/CommandModel.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/commands/Command.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
 class CommandController;
+struct Command;
 
 class CommandModel : public SignalVectorModel<Command>
 {

diff --git a/src/controllers/commands/builtin/twitch/ChatSettings.cpp b/src/controllers/commands/builtin/twitch/ChatSettings.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/CommandContext.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"