chatterino2
Code Issues

Remove BaseSettings & merge ConcurrentSettings (#4775)

Browse Source
This commit is contained in:
pajlada
2023-08-28 17:51:28 +02:00
committed by GitHub
parent 4c942a2a42
commit 7cb04bf58b
18 changed files with 235 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/MessageElement.cpp
+1 -1
View File
@@ -806,7 +806,7 @@ void TwitchModerationElement::addToContainer(MessageLayoutContainer &container,
{
QSize size(int(container.getScale() * 16),
int(container.getScale() * 16));
auto actions = getCSettings().moderationActions.readOnly();
auto actions = getSettings()->moderationActions.readOnly();
for (const auto &action : *actions)
{
if (auto image = action.getImage())
src/messages/SharedMessageBuilder.cpp
+3 -3
View File
@@ -147,7 +147,7 @@ void SharedMessageBuilder::parseUsername()
void SharedMessageBuilder::parseHighlights()
{
if (getCSettings().isBlacklistedUser(this->ircMessage->nick()))
if (getSettings()->isBlacklistedUser(this->ircMessage->nick()))
{
// Do nothing. We ignore highlights from this user.
return;
@@ -206,7 +206,7 @@ void SharedMessageBuilder::triggerHighlights()
return;
}
if (getCSettings().isMutedChannel(this->channel->getName()))
if (getSettings()->isMutedChannel(this->channel->getName()))
{
// Do nothing. Pings are muted in this channel.
return;
@@ -270,7 +270,7 @@ QString SharedMessageBuilder::stylizeUsername(const QString &username,
break;
}
if (auto nicknameText = getCSettings().matchNickname(usernameText))
if (auto nicknameText = getSettings()->matchNickname(usernameText))
{
usernameText = *nicknameText;
}