noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

removed MutedChannelController

Browse source
This commit is contained in:
fourtf 2020-02-28 19:04:25 +01:00
parent e537277fa8
commit ba5d842767
8 changed files with 1 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chatterino.pro
View file

@ -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 \

17
src/controllers/ignores/IgnoreController.cpp
View file

@ -1,17 +0,0 @@
#include "controllers/ignores/IgnoreController.hpp"
#include "Application.hpp"
#include "controllers/ignores/IgnoreModel.hpp"
#include "util/PersistSignalVector.hpp"
#include <cassert>
namespace chatterino {
void IgnoreController::initialize(Settings &, Paths &)
{
assert(!this->initialized_);
this->initialized_ = true;
}
} // namespace chatterino

19
src/controllers/ignores/IgnoreController.hpp
View file

@ -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

12
src/controllers/pings/MutedChannelController.cpp
View file

@ -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

27
src/controllers/pings/MutedChannelController.hpp
View file

@ -1,27 +0,0 @@
#pragma once
#include <QObject>
#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<QString> channels;
};
} // namespace chatterino

2
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -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"

1
src/singletons/Settings.cpp
View file

@ -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"

1
src/widgets/splits/SplitHeader.cpp
View file

@ -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"