diff --git a/chatterino.pro b/chatterino.pro index 755bc589d..41327803c 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -134,13 +134,11 @@ SOURCES += \ src/controllers/highlights/HighlightModel.cpp \ src/controllers/highlights/HighlightPhrase.cpp \ src/controllers/highlights/UserHighlightModel.cpp \ - src/controllers/ignores/IgnoreController.cpp \ src/controllers/ignores/IgnoreModel.cpp \ src/controllers/moderationactions/ModerationAction.cpp \ src/controllers/moderationactions/ModerationActionModel.cpp \ src/controllers/notifications/NotificationController.cpp \ src/controllers/notifications/NotificationModel.cpp \ - src/controllers/pings/MutedChannelController.cpp \ src/controllers/pings/MutedChannelModel.cpp \ src/controllers/taggedusers/TaggedUser.cpp \ src/controllers/taggedusers/TaggedUsersModel.cpp \ @@ -333,7 +331,6 @@ HEADERS += \ src/controllers/moderationactions/ModerationActionModel.hpp \ src/controllers/notifications/NotificationController.hpp \ src/controllers/notifications/NotificationModel.hpp \ - src/controllers/pings/MutedChannelController.hpp \ src/controllers/pings/MutedChannelModel.hpp \ src/controllers/taggedusers/TaggedUser.hpp \ src/controllers/taggedusers/TaggedUsersModel.hpp \ diff --git a/src/controllers/ignores/IgnoreController.cpp b/src/controllers/ignores/IgnoreController.cpp deleted file mode 100644 index 0415032e1..000000000 --- a/src/controllers/ignores/IgnoreController.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "controllers/ignores/IgnoreController.hpp" - -#include "Application.hpp" -#include "controllers/ignores/IgnoreModel.hpp" -#include "util/PersistSignalVector.hpp" - -#include - -namespace chatterino { - -void IgnoreController::initialize(Settings &, Paths &) -{ - assert(!this->initialized_); - this->initialized_ = true; -} - -} // namespace chatterino diff --git a/src/controllers/ignores/IgnoreController.hpp b/src/controllers/ignores/IgnoreController.hpp index c0b11e829..fed12f12c 100644 --- a/src/controllers/ignores/IgnoreController.hpp +++ b/src/controllers/ignores/IgnoreController.hpp @@ -1,26 +1,7 @@ #pragma once -#include "common/ChatterinoSetting.hpp" -#include "common/SignalVector.hpp" -#include "common/Singleton.hpp" -#include "controllers/ignores/IgnorePhrase.hpp" - namespace chatterino { -class Settings; -class Paths; - -class IgnoreModel; - enum class ShowIgnoredUsersMessages { Never, IfModerator, IfBroadcaster }; -class IgnoreController final : public Singleton -{ -public: - virtual void initialize(Settings &settings, Paths &paths) override; - -private: - bool initialized_ = false; -}; - } // namespace chatterino diff --git a/src/controllers/pings/MutedChannelController.cpp b/src/controllers/pings/MutedChannelController.cpp deleted file mode 100644 index 62555fd5e..000000000 --- a/src/controllers/pings/MutedChannelController.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "controllers/pings/MutedChannelController.hpp" -#include "controllers/pings/MutedChannelModel.hpp" -#include "util/PersistSignalVector.hpp" - -namespace chatterino { - -void MutedChannelController::initialize(Settings &settings, Paths &paths) -{ - this->initialized_ = true; -} - -} // namespace chatterino diff --git a/src/controllers/pings/MutedChannelController.hpp b/src/controllers/pings/MutedChannelController.hpp deleted file mode 100644 index ea681fdc9..000000000 --- a/src/controllers/pings/MutedChannelController.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include - -#include "common/SignalVector.hpp" -#include "common/Singleton.hpp" -#include "singletons/Settings.hpp" - -namespace chatterino { - -class Settings; -class Paths; - -class MutedChannelModel; - -class MutedChannelController final : public Singleton, private QObject -{ -public: - virtual void initialize(Settings &settings, Paths &paths) override; - -private: - bool initialized_ = false; - - SignalVector channels; -}; - -} // namespace chatterino diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index 76c42d662..a5ecaae42 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -3,7 +3,7 @@ #include "Application.hpp" #include "controllers/accounts/AccountController.hpp" #include "controllers/ignores/IgnoreController.hpp" -#include "controllers/pings/MutedChannelController.hpp" +#include "controllers/ignores/IgnorePhrase.hpp" #include "messages/Message.hpp" #include "providers/chatterino/ChatterinoBadges.hpp" #include "providers/twitch/TwitchBadges.hpp" diff --git a/src/singletons/Settings.cpp b/src/singletons/Settings.cpp index 95a121d64..60e38e554 100644 --- a/src/singletons/Settings.cpp +++ b/src/singletons/Settings.cpp @@ -4,7 +4,6 @@ #include "controllers/highlights/HighlightBlacklistUser.hpp" #include "controllers/highlights/HighlightPhrase.hpp" #include "controllers/ignores/IgnorePhrase.hpp" -#include "controllers/pings/MutedChannelController.hpp" #include "singletons/Paths.hpp" #include "singletons/Resources.hpp" #include "singletons/WindowManager.hpp" diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index 49a474e35..fb8c024b2 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -3,7 +3,6 @@ #include "Application.hpp" #include "controllers/accounts/AccountController.hpp" #include "controllers/notifications/NotificationController.hpp" -#include "controllers/pings/MutedChannelController.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchIrcServer.hpp" #include "singletons/Resources.hpp"