From cd59f1d5762824ea6ecad918c1448de8ef53d8e9 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 12 Mar 2024 15:57:00 +0300 Subject: [PATCH] Removed redundant constructor from HistoryView::ComposeControls. --- .../controls/history_view_compose_controls.cpp | 16 ---------------- .../controls/history_view_compose_controls.h | 6 ------ .../view/history_view_replies_section.cpp | 14 ++++++++++---- .../view/history_view_scheduled_section.cpp | 14 ++++++++++---- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index bd8d6cb121..8eddbd40d5 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -770,22 +770,6 @@ MessageToEdit FieldHeader::queryToEdit() { }; } -ComposeControls::ComposeControls( - not_null parent, - not_null controller, - Fn)> unavailableEmojiPasted, - Mode mode, - SendMenu::Type sendMenuType) -: ComposeControls(parent, ComposeControlsDescriptor{ - .show = controller->uiShow(), - .unavailableEmojiPasted = std::move(unavailableEmojiPasted), - .mode = mode, - .sendMenuType = sendMenuType, - .regularWindow = controller, - .stickerOrEmojiChosen = controller->stickerOrEmojiChosen(), -}) { -} - ComposeControls::ComposeControls( not_null parent, ComposeControlsDescriptor descriptor) diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h index d21ea9884f..82d1a24dea 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h @@ -128,12 +128,6 @@ public: using FieldHistoryAction = Ui::InputField::HistoryAction; using Mode = ComposeControlsMode; - ComposeControls( - not_null parent, - not_null controller, - Fn)> unavailableEmojiPasted, - Mode mode, - SendMenu::Type sendMenuType); ComposeControls( not_null parent, ComposeControlsDescriptor descriptor); diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp index fc556245bb..8813a2c05f 100644 --- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp @@ -215,10 +215,16 @@ RepliesWidget::RepliesWidget( , _topBarShadow(this) , _composeControls(std::make_unique( this, - controller, - [=](not_null emoji) { listShowPremiumToast(emoji); }, - ComposeControls::Mode::Normal, - SendMenu::Type::SilentOnly)) + ComposeControlsDescriptor{ + .show = controller->uiShow(), + .unavailableEmojiPasted = [=](not_null emoji) { + listShowPremiumToast(emoji); + }, + .mode = ComposeControls::Mode::Normal, + .sendMenuType = SendMenu::Type::SilentOnly, + .regularWindow = controller, + .stickerOrEmojiChosen = controller->stickerOrEmojiChosen(), + })) , _translateBar(std::make_unique(this, controller, history)) , _scroll(std::make_unique( this, diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index ca1fff7c91..2b00066bbd 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -80,10 +80,16 @@ ScheduledWidget::ScheduledWidget( , _topBarShadow(this) , _composeControls(std::make_unique( this, - controller, - [=](not_null emoji) { listShowPremiumToast(emoji); }, - ComposeControls::Mode::Scheduled, - SendMenu::Type::Disabled)) + ComposeControlsDescriptor{ + .show = controller->uiShow(), + .unavailableEmojiPasted = [=](not_null emoji) { + listShowPremiumToast(emoji); + }, + .mode = ComposeControls::Mode::Scheduled, + .sendMenuType = SendMenu::Type::Disabled, + .regularWindow = controller, + .stickerOrEmojiChosen = controller->stickerOrEmojiChosen(), + })) , _cornerButtons( _scroll.data(), controller->chatStyle(),