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

Fix build on latest Fedora (#4518)

Browse source 
gcc (GCC) 13.0.1 20230401 (Red Hat 13.0.1-0)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Guilherme Espada 2023-04-08 07:58:04 +01:00 committed by GitHub
parent 5c08e996c6
commit 7a286480d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/widgets/Notebook.cpp
View file

@ -391,7 +391,8 @@ void Notebook::setShowTabs(bool value)
if (!value && getSettings()->informOnTabVisibilityToggle.getValue()) if (!value && getSettings()->informOnTabVisibilityToggle.getValue())
{ {
auto unhideSeq = getApp()->hotkeys->getDisplaySequence( auto unhideSeq = getApp()->hotkeys->getDisplaySequence(
HotkeyCategory::Window, "setTabVisibility", {{}}); HotkeyCategory::Window, "setTabVisibility",
{std::vector<QString>()});
if (unhideSeq.isEmpty()) if (unhideSeq.isEmpty())
{ {
unhideSeq = getApp()->hotkeys->getDisplaySequence( unhideSeq = getApp()->hotkeys->getDisplaySequence(
@ -436,7 +437,7 @@ void Notebook::setShowTabs(bool value)
void Notebook::updateTabVisibilityMenuAction() void Notebook::updateTabVisibilityMenuAction()
{ {
auto toggleSeq = getApp()->hotkeys->getDisplaySequence( auto toggleSeq = getApp()->hotkeys->getDisplaySequence(
HotkeyCategory::Window, "setTabVisibility", {{}}); HotkeyCategory::Window, "setTabVisibility", {std::vector<QString>()});
if (toggleSeq.isEmpty()) if (toggleSeq.isEmpty())
{ {
toggleSeq = getApp()->hotkeys->getDisplaySequence( toggleSeq = getApp()->hotkeys->getDisplaySequence(

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

@ -451,8 +451,8 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
if (twitchChannel) if (twitchChannel)
{ {
auto bothSeq = auto bothSeq = h->getDisplaySequence(
h->getDisplaySequence(HotkeyCategory::Split, "reloadEmotes", {{}}); HotkeyCategory::Split, "reloadEmotes", {std::vector<QString>()});
auto channelSeq = h->getDisplaySequence(HotkeyCategory::Split, auto channelSeq = h->getDisplaySequence(HotkeyCategory::Split,
"reloadEmotes", {{"channel"}}); "reloadEmotes", {{"channel"}});
auto subSeq = h->getDisplaySequence(HotkeyCategory::Split, auto subSeq = h->getDisplaySequence(HotkeyCategory::Split,
@ -484,8 +484,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
"setModerationMode", {{"toggle"}}); "setModerationMode", {{"toggle"}});
if (modModeSeq.isEmpty()) if (modModeSeq.isEmpty())
{ {
modModeSeq = h->getDisplaySequence(HotkeyCategory::Split, modModeSeq =
"setModerationMode", {{}}); h->getDisplaySequence(HotkeyCategory::Split, "setModerationMode",
{std::vector<QString>()});
// this makes a full std::optional<> with an empty vector inside // this makes a full std::optional<> with an empty vector inside
} }
moreMenu->addAction( moreMenu->addAction(
@ -529,7 +530,8 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
if (notifySeq.isEmpty()) if (notifySeq.isEmpty())
{ {
notifySeq = h->getDisplaySequence(HotkeyCategory::Split, notifySeq = h->getDisplaySequence(HotkeyCategory::Split,
"setChannelNotification", {{}}); "setChannelNotification",
{std::vector<QString>()});
// this makes a full std::optional<> with an empty vector inside // this makes a full std::optional<> with an empty vector inside
} }
action->setShortcut(notifySeq); action->setShortcut(notifySeq);