absorbed HighlightController into Application

This commit is contained in:
fourtf
2020-02-23 21:18:40 +01:00
parent d0a81f3fe7
commit f8a9850151
11 changed files with 70 additions and 103 deletions
+13 -1
View File
@@ -3,6 +3,7 @@
#include <QApplication>
#include <memory>
#include "common/SignalVector.hpp"
#include "common/Singleton.hpp"
#include "singletons/NativeMessaging.hpp"
@@ -31,6 +32,9 @@ class Fonts;
class Toasts;
class ChatterinoBadges;
class HighlightPhrase;
class HighlightBlacklistUser;
class Application
{
std::vector<std::unique_ptr<Singleton>> singletons_;
@@ -50,6 +54,15 @@ public:
friend void test();
// clang-format off
SignalVector<HighlightPhrase> &highlightedMessages;
SignalVector<HighlightPhrase> &highlightedUsers;
SignalVector<HighlightBlacklistUser> &blacklistedUsers;
// clang-format on
bool isHighlightedUser(const QString &username);
bool isBlacklistedUser(const QString &username);
Theme *const themes{};
Fonts *const fonts{};
Emotes *const emotes{};
@@ -58,7 +71,6 @@ public:
AccountController *const accounts{};
CommandController *const commands{};
HighlightController *const highlights{};
NotificationController *const notifications{};
MutedChannelController *const pings{};
IgnoreController *const ignores{};