From f5aba5a907c166afeccbf6ee98a7d43a3eebaad8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Apr 2020 12:34:51 +0400 Subject: [PATCH] Fix build with new lib_ui commits. --- Telegram/SourceFiles/chat_helpers/stickers.cpp | 2 +- Telegram/SourceFiles/history/history_widget.cpp | 2 +- .../history/view/history_view_scheduled_section.cpp | 2 +- .../SourceFiles/history/view/media/history_view_dice.cpp | 2 +- .../SourceFiles/media/view/media_view_overlay_widget.cpp | 6 +++--- Telegram/SourceFiles/ui/widgets/separate_panel.cpp | 4 +--- Telegram/SourceFiles/window/window_peer_menu.cpp | 8 ++++---- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp index 22601e302..32f38c3d0 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp @@ -78,7 +78,7 @@ void ApplyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d) { Local::writeArchivedStickers(); auto toast = Ui::Toast::Config(); - toast.text = tr::lng_stickers_packs_archived(tr::now); + toast.text = { tr::lng_stickers_packs_archived(tr::now) }; toast.maxWidth = toast.minWidth = st::stickersToastMaxWidth; toast.multiline = true; toast.padding = st::stickersToastPadding; diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 6166a5854..c11995f28 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -238,7 +238,7 @@ void ShowErrorToast(const QString &text) { auto config = Ui::Toast::Config(); config.multiline = true; config.minWidth = st::msgMinWidth; - config.text = text; + config.text = { text }; Ui::Toast::Show(config); } diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index ce6158100..3bce43e3f 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -51,7 +51,7 @@ void ShowErrorToast(const QString &text) { auto config = Ui::Toast::Config(); config.multiline = true; config.minWidth = st::msgMinWidth; - config.text = text; + config.text = { text }; Ui::Toast::Show(config); } diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp index 587b0e929..b61170805 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp @@ -52,7 +52,7 @@ ClickHandlerPtr Dice::link() { auto config = Ui::Toast::Config(); config.multiline = true; config.minWidth = st::msgMinWidth; - config.text = tr::lng_about_dice(tr::now); + config.text = { tr::lng_about_dice(tr::now) }; Ui::Toast::Show(config); }); return kHandler; diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 89a0df858..b44f0e538 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -2396,9 +2396,9 @@ void OverlayWidget::initThemePreview() { _themeShare->setClickedCallback([=] { QGuiApplication::clipboard()->setText( Core::App().createInternalLinkFull("addtheme/" + slug)); - auto config = Ui::Toast::Config(); - config.text = tr::lng_background_link_copied(tr::now); - Ui::Toast::Show(this, config); + Ui::Toast::Show( + this, + tr::lng_background_link_copied(tr::now)); }); } else { _themeShare.destroy(); diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp index ea56e2e04..51e4127f2 100644 --- a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp +++ b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp @@ -273,9 +273,7 @@ void SeparatePanel::showBox( } void SeparatePanel::showToast(const QString &text) { - auto toast = Ui::Toast::Config(); - toast.text = text; - Ui::Toast::Show(this, toast); + Ui::Toast::Show(this, text); } void SeparatePanel::ensureLayerCreated() { diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 12464881c..750588625 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -630,7 +630,7 @@ void FolderFiller::addTogglesForArchive() { _addAction(tr::lng_context_archive_to_menu(tr::now), [=] { auto toast = Ui::Toast::Config(); - toast.text = tr::lng_context_archive_to_menu_info(tr::now); + toast.text = { tr::lng_context_archive_to_menu_info(tr::now) }; toast.minWidth = toast.maxWidth = st::boxWideWidth; toast.multiline = true; toast.durationMs = kArchivedToastDuration; @@ -927,7 +927,7 @@ QPointer ShowSendNowMessagesBox( auto config = Ui::Toast::Config(); config.multiline = true; config.minWidth = st::msgMinWidth; - config.text = error; + config.text = { error }; Ui::Toast::Show(config); return { nullptr }; } @@ -1036,9 +1036,9 @@ void PeerMenuAddMuteAction( void ToggleHistoryArchived(not_null history, bool archived) { const auto callback = [=] { auto toast = Ui::Toast::Config(); - toast.text = archived + toast.text = { archived ? tr::lng_archived_added(tr::now) - : tr::lng_archived_removed(tr::now); + : tr::lng_archived_removed(tr::now) }; toast.minWidth = toast.maxWidth = st::boxWideWidth; toast.multiline = true; if (archived) {