turning a lot of includes into forward declares

src/providers/bttv/BttvEmotes.cpp

@@ -1,5 +1,6 @@
 #include "providers/bttv/BttvEmotes.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"

src/providers/bttv/BttvEmotes.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
+#include <boost/optional.hpp>
 #include <memory>
+
 #include "common/Atomic.hpp"
 #include "messages/Emote.hpp"
 

src/providers/chatterino/ChatterinoBadges.cpp

@@ -14,39 +14,41 @@ ChatterinoBadges::ChatterinoBadges()
 
 boost::optional<EmotePtr> ChatterinoBadges::getBadge(const UserName &username)
 {
-    return this->badges.access()->get(username);
+    return boost::none;
+    // return this->badges.access()->get(username);
 }
 
 void ChatterinoBadges::loadChatterinoBadges()
 {
-    static QString url("https://fourtf.com/chatterino/badges.json");
+    // static QString url("https://fourtf.com/chatterino/badges.json");
 
-    NetworkRequest req(url);
-    req.setCaller(QThread::currentThread());
+    // NetworkRequest req(url);
+    // req.setCaller(QThread::currentThread());
 
-    req.onSuccess([this](auto result) {
-        auto jsonRoot = result.parseJson();
-        auto badges = this->badges.access();
-        auto replacement = badges->makeReplacment();
+    // req.onSuccess([this](auto result) {
+    //    auto jsonRoot = result.parseJson();
+    //    auto badges = this->badges.access();
+    //    auto replacement = badges->makeReplacment();
 
-        for (auto jsonBadge_ : jsonRoot.value("badges").toArray()) {
-            auto jsonBadge = jsonBadge_.toObject();
+    //    for (auto jsonBadge_ : jsonRoot.value("badges").toArray()) {
+    //        auto jsonBadge = jsonBadge_.toObject();
 
-            auto emote = Emote{
-                EmoteName{}, ImageSet{Url{jsonBadge.value("image").toString()}},
-                Tooltip{jsonBadge.value("tooltip").toString()}, Url{}};
+    //        auto emote = Emote{
+    //            EmoteName{},
+    //            ImageSet{Url{jsonBadge.value("image").toString()}},
+    //            Tooltip{jsonBadge.value("tooltip").toString()}, Url{}};
 
-            for (auto jsonUser : jsonBadge.value("users").toArray()) {
-                replacement.add(UserName{jsonUser.toString()},
-                                std::move(emote));
-            }
-        }
+    //        for (auto jsonUser : jsonBadge.value("users").toArray()) {
+    //            replacement.add(UserName{jsonUser.toString()},
+    //                            std::move(emote));
+    //        }
+    //    }
 
-        replacement.apply();
-        return Success;
-    });
+    //    replacement.apply();
+    //    return Success;
+    //});
 
-    req.execute();
+    // req.execute();
 }
 
 }  // namespace chatterino

src/providers/chatterino/ChatterinoBadges.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
 #include <boost/optional.hpp>
-#include <unordered_map>
-#include "common/Common.hpp"
-#include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "messages/EmoteCache.hpp"
+
+#include "common/Aliases.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class ChatterinoBadges
 {
 public:
@@ -19,7 +19,7 @@ public:
 private:
     void loadChatterinoBadges();
 
-    UniqueAccess<EmoteCache<UserName>> badges;
+    // UniqueAccess<EmoteCache<UserName>> badges;
 };
 
 }  // namespace chatterino

src/providers/emoji/Emojis.cpp

@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "singletons/Settings.hpp"
 
 #include <rapidjson/error/en.h>

src/providers/emoji/Emojis.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "messages/Emote.hpp"
 #include "util/ConcurrentMap.hpp"
 
 #include <QMap>
@@ -12,6 +11,9 @@
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 struct EmojiData {
     // actual byte-representation of the emoji (i.e. \154075\156150 which is
     // :male:)

src/providers/ffz/FfzEmotes.cpp

@@ -3,6 +3,7 @@
 #include <QJsonArray>
 
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
 

src/providers/irc/AbstractIrcServer.cpp

@@ -1,6 +1,8 @@
 #include "AbstractIrcServer.hpp"
 
+#include "common/Channel.hpp"
 #include "common/Common.hpp"
+#include "debug/Log.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"

src/providers/irc/AbstractIrcServer.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "providers/irc/IrcConnection2.hpp"
 
 #include <IrcMessage>
@@ -11,6 +10,9 @@
 
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class AbstractIrcServer
 {
 public:

src/providers/twitch/IrcMessageHandler.cpp

@@ -10,6 +10,7 @@
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 

src/providers/twitch/PartialTwitchUser.cpp

@@ -1,5 +1,6 @@
 #include "providers/twitch/PartialTwitchUser.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"

src/providers/twitch/PubsubHelpers.cpp

@@ -1,6 +1,7 @@
 #include "providers/twitch/PubsubHelpers.hpp"
 
 #include "providers/twitch/PubsubActions.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {

src/providers/twitch/PubsubHelpers.hpp

@@ -1,16 +1,14 @@
 #pragma once
 
-#include "debug/Log.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
-
 #include <memory>
 
 namespace chatterino {
 
+class TwitchAccount;
 struct ActionUser;
 
 const rapidjson::Value &getArgs(const rapidjson::Value &data);

src/providers/twitch/TwitchAccount.cpp

@@ -4,6 +4,7 @@
 
 #include "Application.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/PartialTwitchUser.hpp"
 #include "providers/twitch/TwitchCommon.hpp"

src/providers/twitch/TwitchAccount.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/UniqueAccess.hpp"
 #include "controllers/accounts/Account.hpp"

src/providers/twitch/TwitchAccountManager.cpp

@@ -2,6 +2,7 @@
 
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 
 namespace chatterino {

src/providers/twitch/TwitchAccountManager.hpp

@@ -17,6 +17,7 @@
 
 namespace chatterino {
 
+class TwitchAccount;
 class AccountController;
 
 class TwitchAccountManager

src/providers/twitch/TwitchApi.cpp

@@ -1,5 +1,6 @@
 #include "providers/twitch/TwitchApi.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"

src/providers/twitch/TwitchApi.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QString>
+#include <functional>
 
 namespace chatterino {
 

src/providers/twitch/TwitchBadges.cpp

@@ -5,6 +5,8 @@
 #include <QJsonValue>
 #include <QThread>
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
+#include "messages/Emote.hpp"
 
 namespace chatterino {
 

src/providers/twitch/TwitchBadges.hpp

@@ -1,12 +1,14 @@
 #pragma once
 
 #include <QString>
-#include <messages/Emote.hpp>
 #include <unordered_map>
 #include "util/QStringHash.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class Settings;
 class Paths;
 

src/providers/twitch/TwitchChannel.cpp

@@ -1,5 +1,6 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
+#include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"

src/providers/twitch/TwitchChannel.hpp

@@ -2,21 +2,23 @@
 
 #include <IrcConnection>
 
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
-#include "common/Common.hpp"
+#include "common/Outcome.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "singletons/Emotes.hpp"
-#include "util/ConcurrentMap.hpp"
-
-#include <pajlada/signals/signalholder.hpp>
 
+#include <boost/optional.hpp>
 #include <mutex>
+#include <pajlada/signals/signalholder.hpp>
 #include <unordered_map>
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+class EmoteMap;
+
 class TwitchServer;
 
 class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder

src/providers/twitch/TwitchEmotes.cpp

@@ -3,6 +3,7 @@
 #include "common/NetworkRequest.hpp"
 #include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "util/RapidjsonHelpers.hpp"
 

src/providers/twitch/TwitchEmotes.hpp

@@ -3,18 +3,18 @@
 #include <QString>
 #include <unordered_map>
 
+#include "common/Aliases.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "providers/twitch/EmoteValue.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
-#include "util/ConcurrentMap.hpp"
 
 #define TWITCH_EMOTE_TEMPLATE \
     "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class TwitchEmotes
 {
 public:

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -5,6 +5,7 @@
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "debug/Log.hpp"
+#include "messages/Message.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Resources.hpp"
@@ -12,6 +13,7 @@
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
+#include "widgets/Window.hpp"
 
 #include <QApplication>
 #include <QDebug>

src/providers/twitch/TwitchMessageBuilder.hpp

@@ -1,15 +1,18 @@
 #pragma once
 
+#include "common/Aliases.hpp"
+#include "common/Outcome.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "singletons/Emotes.hpp"
 
 #include <IrcMessage>
-
 #include <QString>
 #include <QVariant>
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class Channel;
 class TwitchChannel;
 

src/providers/twitch/TwitchServer.cpp

@@ -7,6 +7,7 @@
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/PubsubClient.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchHelpers.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "util/PostToThread.hpp"

src/providers/twitch/TwitchServer.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "common/Atomic.hpp"
+#include "common/Channel.hpp"
 #include "common/Singleton.hpp"
+#include "pajlada/signals/signalholder.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
 
 #include <chrono>
 #include <memory>