chatterino2
Code Issues

Renamed variables to clear some warnings.

Browse Source
This commit is contained in:
23rd
2019-05-08 09:51:14 +03:00
committed by pajlada
parent efec76df5b
commit 9654650bee
19 changed files with 73 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchMessageBuilder.cpp
+14 -21
View File
@@ -334,13 +334,13 @@ MessagePtr TwitchMessageBuilder::build()
QRegularExpression emoteregex(
"\\b" + std::get<2>(tup).string + "\\b",
QRegularExpression::UseUnicodePropertiesOption);
auto match = emoteregex.match(midExtendedRef);
if (match.hasMatch())
auto _match = emoteregex.match(midExtendedRef);
if (_match.hasMatch())
{
int last = match.lastCapturedIndex();
int last = _match.lastCapturedIndex();
for (int i = 0; i <= last; ++i)
{
std::get<0>(tup) = from + match.capturedStart();
std::get<0>(tup) = from + _match.capturedStart();
twitchEmotes.push_back(std::move(tup));
}
}
@@ -781,16 +781,9 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
}
// update the media player url if necessary
QUrl highlightSoundUrl;
if (getSettings()->customHighlightSound)
{
highlightSoundUrl =
QUrl::fromLocalFile(getSettings()->pathHighlightSound.getValue());
}
else
{
highlightSoundUrl = QUrl("qrc:/sounds/ping2.wav");
}
QUrl highlightSoundUrl = getSettings()->customHighlightSound
? QUrl::fromLocalFile(getSettings()->pathHighlightSound.getValue())
: QUrl("qrc:/sounds/ping2.wav");
if (currentPlayerUrl != highlightSoundUrl)
{
@@ -1040,11 +1033,11 @@ void TwitchMessageBuilder::appendTwitchBadges()
try
{
if (twitchChannel)
if (const auto &badge = this->twitchChannel->twitchBadge(
if (const auto &_badge = this->twitchChannel->twitchBadge(
"bits", cheerAmount))
{
this->emplace<EmoteElement>(
badge.get(), MessageElementFlag::BadgeVanity)
_badge.get(), MessageElementFlag::BadgeVanity)
->setTooltip(tooltip);
continue;
}
@@ -1055,10 +1048,10 @@ void TwitchMessageBuilder::appendTwitchBadges()
}
// Use default bit badge
if (auto badge = this->twitchChannel->globalTwitchBadges().badge(
if (auto _badge = this->twitchChannel->globalTwitchBadges().badge(
"bits", cheerAmount))
{
this->emplace<EmoteElement>(badge.get(),
this->emplace<EmoteElement>(_badge.get(),
MessageElementFlag::BadgeVanity)
->setTooltip(tooltip);
}
@@ -1174,12 +1167,12 @@ void TwitchMessageBuilder::appendTwitchBadges()
->setTooltip((*badgeEmote)->tooltip.string);
continue;
}
if (auto badge = this->twitchChannel->globalTwitchBadges().badge(
if (auto _badge = this->twitchChannel->globalTwitchBadges().badge(
splits[0], splits[1]))
{
this->emplace<EmoteElement>(badge.get(),
this->emplace<EmoteElement>(_badge.get(),
MessageElementFlag::BadgeVanity)
->setTooltip((*badge)->tooltip.string);
->setTooltip((*_badge)->tooltip.string);
continue;
}
}