removed functions from SettingsManager that shouldn't be there
This commit is contained in:
@@ -108,7 +108,7 @@ void Image::loadImage()
|
||||
this->loadedPixmap = pixmap;
|
||||
}
|
||||
|
||||
chatterino::Image::FrameData data;
|
||||
Image::FrameData data;
|
||||
data.duration = std::max(20, reader.nextImageDelay());
|
||||
data.image = pixmap;
|
||||
|
||||
|
||||
@@ -200,7 +200,7 @@ public:
|
||||
|
||||
// void insertAfter(const std::vector<T> &items, const T &index)
|
||||
|
||||
chatterino::LimitedQueueSnapshot<T> getSnapshot()
|
||||
LimitedQueueSnapshot<T> getSnapshot()
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(this->mutex);
|
||||
|
||||
|
||||
@@ -175,8 +175,7 @@ MessagePtr Message::createTimeoutMessage(const BanAction &action, uint32_t count
|
||||
}
|
||||
}
|
||||
|
||||
msg->addElement(new chatterino::TextElement(text, chatterino::MessageElement::Text,
|
||||
chatterino::MessageColor::System));
|
||||
msg->addElement(new TextElement(text, MessageElement::Text, MessageColor::System));
|
||||
msg->searchText = text;
|
||||
|
||||
return msg;
|
||||
@@ -204,8 +203,7 @@ MessagePtr Message::createUntimeoutMessage(const UnbanAction &action)
|
||||
.arg(action.target.name);
|
||||
}
|
||||
|
||||
msg->addElement(new chatterino::TextElement(text, chatterino::MessageElement::Text,
|
||||
chatterino::MessageColor::System));
|
||||
msg->addElement(new TextElement(text, MessageElement::Text, MessageColor::System));
|
||||
msg->searchText = text;
|
||||
|
||||
return msg;
|
||||
|
||||
@@ -13,7 +13,7 @@ MessageColor::MessageColor(Type _type)
|
||||
{
|
||||
}
|
||||
|
||||
const QColor &MessageColor::getColor(chatterino::ThemeManager &themeManager) const
|
||||
const QColor &MessageColor::getColor(ThemeManager &themeManager) const
|
||||
{
|
||||
switch (this->type) {
|
||||
case Type::Custom:
|
||||
|
||||
@@ -12,7 +12,7 @@ struct MessageColor {
|
||||
MessageColor(const QColor &color);
|
||||
MessageColor(Type type = Text);
|
||||
|
||||
const QColor &getColor(chatterino::ThemeManager &themeManager) const;
|
||||
const QColor &getColor(ThemeManager &themeManager) const;
|
||||
|
||||
private:
|
||||
Type type;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "Application.hpp"
|
||||
#include "common/Emotemap.hpp"
|
||||
#include "controllers/moderationactions/ModerationActions.hpp"
|
||||
#include "debug/Benchmark.hpp"
|
||||
#include "messages/layouts/MessageLayoutContainer.hpp"
|
||||
#include "messages/layouts/MessageLayoutElement.hpp"
|
||||
@@ -248,7 +249,7 @@ void TwitchModerationElement::addToContainer(MessageLayoutContainer &container,
|
||||
if (_flags & MessageElement::ModeratorTools) {
|
||||
QSize size((int)(container.getScale() * 16), (int)(container.getScale() * 16));
|
||||
|
||||
for (const chatterino::ModerationAction &m : getApp()->settings->getModerationActions()) {
|
||||
for (const ModerationAction &m : getApp()->moderationActions->items.getVector()) {
|
||||
if (m.isImage()) {
|
||||
container.addElement((new ImageLayoutElement(*this, m.getImage(), size))
|
||||
->setLink(Link(Link::UserAction, m.getAction())));
|
||||
|
||||
Reference in New Issue
Block a user