From 348b4d54ba05bb271f2c70d35e2a6372bd264d21 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 17 Mar 2021 22:13:23 +0400 Subject: [PATCH] Revert "Workaround build issues on GCC." This reverts commit 3defb067833999c240f0ecc39864952515f22fba. --- Telegram/SourceFiles/calls/calls_group_panel.cpp | 8 ++++---- Telegram/SourceFiles/ui/toasts/common_toasts.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index bd8e5fd95..b0994d1c6 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -609,13 +609,13 @@ void Panel::setupJoinAsChangedToasts() { return (state == State::Joined); }) | rpl::take(1); }) | rpl::flatten_latest() | rpl::start_with_next([=] { - Ui::ShowMultilineToast(Ui::MultilineToastArgs{ + Ui::ShowMultilineToast({ + .parentOverride = widget(), .text = tr::lng_group_call_join_as_changed( tr::now, lt_name, Ui::Text::Bold(_call->joinAs()->name), Ui::Text::WithEntities), - .parentOverride = widget(), }); }, widget()->lifetime()); } @@ -629,13 +629,13 @@ void Panel::setupTitleChangedToasts() { ? _peer->name : _peer->groupCall()->title(); }) | rpl::start_with_next([=](const QString &title) { - Ui::ShowMultilineToast(Ui::MultilineToastArgs{ + Ui::ShowMultilineToast({ + .parentOverride = widget(), .text = tr::lng_group_call_title_changed( tr::now, lt_title, Ui::Text::Bold(title), Ui::Text::WithEntities), - .parentOverride = widget(), }); }, widget()->lifetime()); } diff --git a/Telegram/SourceFiles/ui/toasts/common_toasts.h b/Telegram/SourceFiles/ui/toasts/common_toasts.h index 33b1db0cd..ebf1efe1d 100644 --- a/Telegram/SourceFiles/ui/toasts/common_toasts.h +++ b/Telegram/SourceFiles/ui/toasts/common_toasts.h @@ -12,9 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Ui { struct MultilineToastArgs { + QWidget *parentOverride = nullptr; TextWithEntities text; crl::time duration = 0; - QWidget *parentOverride = nullptr; }; void ShowMultilineToast(MultilineToastArgs &&args);