From 0696a2d5c0671e0772fdc0a1a6ddadb62664828d Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 21 Jun 2020 19:25:29 +0300 Subject: [PATCH] Replaced mapping to rpl::empty_value with rpl::to_empty. --- .../SourceFiles/boxes/dictionaries_manager.cpp | 18 ++++-------------- .../SourceFiles/boxes/local_storage_box.cpp | 2 +- Telegram/SourceFiles/boxes/passcode_box.cpp | 6 +++--- Telegram/SourceFiles/boxes/sessions_box.cpp | 4 +--- .../chat_helpers/spellchecker_common.cpp | 5 ++--- .../chat_helpers/tabbed_selector.cpp | 2 +- Telegram/SourceFiles/core/ui_integration.cpp | 2 +- .../data/data_scheduled_messages.cpp | 4 +--- .../dialogs/dialogs_inner_widget.cpp | 3 +-- .../SourceFiles/dialogs/dialogs_widget.cpp | 4 ++-- .../export/view/export_view_progress.cpp | 7 +++---- .../export/view/export_view_settings.cpp | 10 ++-------- .../SourceFiles/history/history_widget.cpp | 5 ++--- .../view/history_view_compose_controls.cpp | 10 +++------- .../view/history_view_contact_status.cpp | 14 +++++--------- Telegram/SourceFiles/info/info_top_bar.cpp | 10 ++++------ .../info/profile/info_profile_values.cpp | 2 +- Telegram/SourceFiles/main/main_account.cpp | 3 +-- Telegram/SourceFiles/mainwidget.cpp | 10 ++++------ .../passport/passport_panel_controller.cpp | 6 ++---- .../passport/passport_panel_edit_scans.cpp | 6 ++---- .../SourceFiles/settings/settings_chat.cpp | 2 +- .../SourceFiles/settings/settings_folders.cpp | 6 +++--- .../settings/settings_privacy_security.cpp | 5 ++--- .../SourceFiles/ui/widgets/separate_panel.cpp | 6 ++---- .../SourceFiles/window/window_filters_menu.cpp | 3 +-- .../SourceFiles/window/window_lock_widgets.cpp | 10 +++------- .../SourceFiles/window/window_outdated_bar.cpp | 4 +--- Telegram/lib_rpl | 2 +- 29 files changed, 60 insertions(+), 111 deletions(-) diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp index f7776a0ad..b5947593a 100644 --- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp +++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp @@ -246,22 +246,15 @@ auto AddButtonWithLoader( ) | rpl::then( rpl::merge( // Events to toggle on. - dictionaryFromGlobalLoader->events( - ) | rpl::map([] { - return true; - }), + dictionaryFromGlobalLoader->events() | rpl::map_to(true), // Events to toggle off. rpl::merge( dictionaryRemoved->events(), buttonState->value( ) | rpl::filter([](const DictState &state) { return state.is(); - }) | rpl::map([] { - return rpl::empty_value(); - }) - ) | rpl::map([] { - return false; - }) + }) | rpl::to_empty + ) | rpl::map_to(false) ) ) ); @@ -275,10 +268,7 @@ auto AddButtonWithLoader( buttonEnabled ) | rpl::then( rpl::merge( - dictionaryRemoved->events( - ) | rpl::map([] { - return false; - }), + dictionaryRemoved->events() | rpl::map_to(false), button->toggledValue() ) ) | rpl::map([=](auto enabled) { diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp index 4f6d685e8..e8c7559ad 100644 --- a/Telegram/SourceFiles/boxes/local_storage_box.cpp +++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp @@ -206,7 +206,7 @@ void LocalStorageBox::Row::radialAnimationCallback() { } rpl::producer<> LocalStorageBox::Row::clearRequests() const { - return _clear->clicks() | rpl::map([] { return rpl::empty_value(); }); + return _clear->clicks() | rpl::to_empty; } int LocalStorageBox::Row::resizeGetHeight(int newWidth) { diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index 624bd2c91..6cc54aac1 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -902,9 +902,9 @@ void PasscodeBox::recover() { _cloudFields.notEmptyPassport)); box->passwordCleared( - ) | rpl::map([] { - return QByteArray(); - }) | rpl::start_to_stream(_newPasswordSet, lifetime()); + ) | rpl::map_to( + QByteArray() + ) | rpl::start_to_stream(_newPasswordSet, lifetime()); box->recoveryExpired( ) | rpl::start_with_next([=] { diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp index 23e07688e..6d572f3b4 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.cpp +++ b/Telegram/SourceFiles/boxes/sessions_box.cpp @@ -425,9 +425,7 @@ void SessionsBox::Inner::showData(const Full &data) { } rpl::producer<> SessionsBox::Inner::terminateAll() const { - return _terminateAll->clicks() | rpl::map([] { - return rpl::empty_value(); - }); + return _terminateAll->clicks() | rpl::to_empty; } rpl::producer SessionsBox::Inner::terminateOne() const { diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp index e681dd3a6..100f08599 100644 --- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp +++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp @@ -335,16 +335,15 @@ rpl::producer ButtonManageDictsState( ? QString::number(filtered.size()) : tr::lng_contacts_loading(tr::now); }; - const auto emptyValue = [] { return rpl::empty_value(); }; return rpl::single( computeString() ) | rpl::then( rpl::merge( Spellchecker::SupportedScriptsChanged(), Core::App().settings().dictionariesEnabledChanges( - ) | rpl::map(emptyValue), + ) | rpl::to_empty, Core::App().settings().spellcheckerEnabledChanges( - ) | rpl::map(emptyValue) + ) | rpl::to_empty ) | rpl::map(computeString) ); } diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index 47acd5300..bf85f6962 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -335,7 +335,7 @@ TabbedSelector::TabbedSelector( rpl::merge( (full() - ? stickers()->scrollUpdated() | rpl::map([] { return 0; }) + ? stickers()->scrollUpdated() | rpl::map_to(0) : rpl::never() | rpl::type_erased()), _scroll->scrollTopChanges() ) | rpl::start_with_next([=] { diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp index 617110625..bfb7ad09e 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -156,7 +156,7 @@ rpl::producer<> UiIntegration::forcePopupMenuHideRequests() { return rpl::merge( Core::App().passcodeLockChanges(), Core::App().termsLockChanges() - ) | rpl::map([] { return rpl::empty_value(); }); + ) | rpl::to_empty; } QString UiIntegration::convertTagToMimeTag(const QString &tagId) { diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp index 3e49bf176..01ed13ef7 100644 --- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp +++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp @@ -316,9 +316,7 @@ rpl::producer<> ScheduledMessages::updates(not_null history) { return _updates.events( ) | rpl::filter([=](not_null value) { return (value == history); - }) | rpl::map([] { - return rpl::empty_value(); - }); + }) | rpl::to_empty; } Data::MessagesSlice ScheduledMessages::list(not_null history) { diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 8c98f29ef..47159854e 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -198,8 +198,7 @@ InnerWidget::InnerWidget( }, lifetime()); rpl::merge( - session().settings().archiveCollapsedChanges( - ) | rpl::map([] { return rpl::empty_value(); }), + session().settings().archiveCollapsedChanges() | rpl::to_empty, session().data().chatsFilters().changed() ) | rpl::start_with_next([=] { refreshWithCollapsedRows(); diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 6d294c09e..88bbd51c1 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -197,7 +197,7 @@ Widget::Widget( }, lifetime()); fullSearchRefreshOn(session().settings().skipArchiveInSearchChanges( - ) | rpl::map([] { return rpl::empty_value(); })); + ) | rpl::to_empty); connect(_inner, SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int))); connect(_inner, SIGNAL(mustScrollTo(int,int)), _scroll, SLOT(scrollToY(int,int))); @@ -422,7 +422,7 @@ void Widget::setupSupportMode() { } fullSearchRefreshOn(session().settings().supportAllSearchResultsValue( - ) | rpl::map([] { return rpl::empty_value(); })); + ) | rpl::to_empty); } void Widget::fullSearchRefreshOn(rpl::producer<> events) { diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp index 16553a36c..3fa3ede31 100644 --- a/Telegram/SourceFiles/export/view/export_view_progress.cpp +++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp @@ -264,7 +264,7 @@ ProgressWidget::ProgressWidget( rpl::producer<> ProgressWidget::cancelClicks() const { return _cancel - ? (_cancel->clicks() | rpl::map([] { return rpl::empty_value(); })) + ? (_cancel->clicks() | rpl::to_empty) : (rpl::never<>() | rpl::type_erased()); } @@ -326,9 +326,8 @@ void ProgressWidget::showDone() { _done->setFullWidth(desired); } _done->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }) | rpl::start_to_stream(_doneClicks, _done->lifetime()); + ) | rpl::to_empty + | rpl::start_to_stream(_doneClicks, _done->lifetime()); setupBottomButton(_done.get()); } diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp index c5744a600..e9dbc40af 100644 --- a/Telegram/SourceFiles/export/view/export_view_settings.cpp +++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp @@ -742,10 +742,7 @@ void SettingsWidget::refreshButtons( : nullptr; if (start) { start->show(); - _startClicks = start->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }); + _startClicks = start->clicks() | rpl::to_empty; container->sizeValue( ) | rpl::start_with_next([=](QSize size) { @@ -760,10 +757,7 @@ void SettingsWidget::refreshButtons( tr::lng_cancel(), st::defaultBoxButton); cancel->show(); - _cancelClicks = cancel->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }); + _cancelClicks = cancel->clicks() | rpl::to_empty; rpl::combine( container->sizeValue(), diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 2dc0c470b..ecccead6e 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -178,18 +178,17 @@ object_ptr SetupDiscussButton( -> rpl::producer> { if (chat) { using UpdateFlag = Data::PeerUpdate::Flag; - auto to_empty = rpl::map([=] { return rpl::empty_value(); }); return rpl::merge( chat->session().changes().historyUpdates( Data::HistoryUpdate::Flag::UnreadView ) | rpl::filter([=](const Data::HistoryUpdate &update) { return (update.history->peer == chat); - }) | to_empty, + }) | rpl::to_empty, chat->session().changes().peerFlagsValue( chat, UpdateFlag::Notifications | UpdateFlag::ChannelAmIn - ) | to_empty + ) | rpl::to_empty ) | rpl::map([=] { const auto history = chat->amIn() ? chat->owner().historyLoaded(chat) diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp index 5d1d76cc8..49e04c63f 100644 --- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp @@ -98,20 +98,16 @@ rpl::producer<> ComposeControls::cancelRequests() const { } rpl::producer<> ComposeControls::sendRequests() const { - auto toEmpty = rpl::map([] { return rpl::empty_value(); }); auto submits = base::qt_signal_producer( _field.get(), &Ui::InputField::submitted); return rpl::merge( - _send->clicks() | toEmpty, - std::move(submits) | toEmpty); + _send->clicks() | rpl::to_empty, + std::move(submits) | rpl::to_empty); } rpl::producer<> ComposeControls::attachRequests() const { - return _attachToggle->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }); + return _attachToggle->clicks() | rpl::to_empty; } void ComposeControls::setMimeDataHook(MimeDataHook hook) { diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp index 94b2113cd..0c8d3340a 100644 --- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp +++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp @@ -53,10 +53,6 @@ bool BarCurrentlyHidden(not_null peer) { return false; } -auto MapToEmpty() { - return rpl::map([] { return rpl::empty_value(); }); -} - } // namespace ContactStatus::Bar::Bar(QWidget *parent, const QString &name) @@ -94,23 +90,23 @@ void ContactStatus::Bar::showState(State state) { } rpl::producer<> ContactStatus::Bar::addClicks() const { - return _add->clicks() | MapToEmpty(); + return _add->clicks() | rpl::to_empty; } rpl::producer<> ContactStatus::Bar::blockClicks() const { - return _block->clicks() | MapToEmpty(); + return _block->clicks() | rpl::to_empty; } rpl::producer<> ContactStatus::Bar::shareClicks() const { - return _share->clicks() | MapToEmpty(); + return _share->clicks() | rpl::to_empty; } rpl::producer<> ContactStatus::Bar::reportClicks() const { - return _report->clicks() | MapToEmpty(); + return _report->clicks() | rpl::to_empty; } rpl::producer<> ContactStatus::Bar::closeClicks() const { - return _close->clicks() | MapToEmpty(); + return _close->clicks() | rpl::to_empty; } void ContactStatus::Bar::resizeEvent(QResizeEvent *e) { diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp index be7b14c3c..cf2ea1944 100644 --- a/Telegram/SourceFiles/info/info_top_bar.cpp +++ b/Telegram/SourceFiles/info/info_top_bar.cpp @@ -107,9 +107,8 @@ void TopBar::enableBackButton() { _back->setDuration(st::infoTopBarDuration); _back->toggle(!selectionMode(), anim::type::instant); _back->entity()->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }) | rpl::start_to_stream(_backClicks, _back->lifetime()); + ) | rpl::to_empty + | rpl::start_to_stream(_backClicks, _back->lifetime()); registerToggleControlCallback(_back.data(), [=] { return !selectionMode(); }); @@ -444,9 +443,8 @@ void TopBar::createSelectionControls() { st::infoTopBarScale)); _cancelSelection->setDuration(st::infoTopBarDuration); _cancelSelection->entity()->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }) | rpl::start_to_stream( + ) | rpl::to_empty + | rpl::start_to_stream( _cancelSelectionClicks, _cancelSelection->lifetime()); _selectionText = wrap(Ui::CreateChild>( diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp index 6e1bbb549..a30b8a81d 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp @@ -155,7 +155,7 @@ rpl::producer NotificationsEnabledValue(not_null peer) { peer->session().changes().peerFlagsValue( peer, UpdateFlag::Notifications - ) | rpl::map([] { return rpl::empty_value(); }), + ) | rpl::to_empty, peer->owner().defaultNotifyUpdates(peer) ) | rpl::map([=] { return !peer->owner().notifyIsMuted(peer); diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp index c3a5a3f66..66f7e8d18 100644 --- a/Telegram/SourceFiles/main/main_account.cpp +++ b/Telegram/SourceFiles/main/main_account.cpp @@ -392,8 +392,7 @@ void Account::startMtp(std::unique_ptr config) { const auto writingConfig = _lifetime.make_state(false); rpl::merge( _mtp->config().updates(), - _mtp->dcOptions().changed( - ) | rpl::map([] { return rpl::empty_value(); }) + _mtp->dcOptions().changed() | rpl::to_empty ) | rpl::filter([=] { return !*writingConfig; }) | rpl::start_with_next([=] { diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 69758b310..be3dab507 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -277,10 +277,8 @@ MainWidget::MainWidget( updateDialogsWidthAnimated(); }); rpl::merge( - session().settings().dialogsWidthRatioChanges() - | rpl::map([] { return rpl::empty_value(); }), - session().settings().thirdColumnWidthChanges() - | rpl::map([] { return rpl::empty_value(); }) + session().settings().dialogsWidthRatioChanges() | rpl::to_empty, + session().settings().thirdColumnWidthChanges() | rpl::to_empty ) | rpl::start_with_next( [this] { updateControlsGeometry(); }, lifetime()); @@ -918,7 +916,7 @@ void MainWidget::createPlayer() { this, object_ptr(this, &session())); rpl::merge( - _player->heightValue() | rpl::map([] { return true; }), + _player->heightValue() | rpl::map_to(true), _player->shownValue() ) | rpl::start_with_next( [this] { playerHeightUpdated(); }, @@ -1061,7 +1059,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) { updateControlsGeometry(); } rpl::merge( - _exportTopBar->heightValue() | rpl::map([] { return true; }), + _exportTopBar->heightValue() | rpl::map_to(true), _exportTopBar->shownValue() ) | rpl::start_with_next([=] { exportTopBarHeightUpdated(); diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp index bbd1f284f..faa95de32 100644 --- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp @@ -633,9 +633,7 @@ void PanelController::fillRows( rpl::producer<> PanelController::refillRows() const { return rpl::merge( _submitFailed.events(), - _form->valueSaveFinished() | rpl::map([] { - return rpl::empty_value(); - })); + _form->valueSaveFinished() | rpl::to_empty); } void PanelController::submitForm() { @@ -703,7 +701,7 @@ void PanelController::setupPassword() { box->newPasswordSet( ) | rpl::filter([=](const QByteArray &password) { return password.isEmpty(); - }) | rpl::map([] { return rpl::empty_value(); }) + }) | rpl::to_empty ) | rpl::start_with_next([=] { _form->reloadPassword(); }, box->lifetime()); diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp index 839e2e072..04356e3ce 100644 --- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp @@ -85,12 +85,10 @@ public: void setError(bool error); rpl::producer<> deleteClicks() const { - return _delete->entity()->clicks( - ) | rpl::map([] { return rpl::empty_value(); }); + return _delete->entity()->clicks() | rpl::to_empty; } rpl::producer<> restoreClicks() const { - return _restore->entity()->clicks( - ) | rpl::map([] { return rpl::empty_value(); }); + return _restore->entity()->clicks() | rpl::to_empty; } protected: diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp index 0c7b04c07..a8f9b9353 100644 --- a/Telegram/SourceFiles/settings/settings_chat.cpp +++ b/Telegram/SourceFiles/settings/settings_chat.cpp @@ -196,7 +196,7 @@ void ColorsPalette::Button::update( } rpl::producer<> ColorsPalette::Button::clicks() const { - return _widget.clicks() | rpl::map([] { return rpl::empty_value(); }); + return _widget.clicks() | rpl::to_empty; } bool ColorsPalette::Button::selected() const { diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp index 9331f89a7..30243b1b1 100644 --- a/Telegram/SourceFiles/settings/settings_folders.cpp +++ b/Telegram/SourceFiles/settings/settings_folders.cpp @@ -246,15 +246,15 @@ void FilterRowButton::updateButtonsVisibility() { } rpl::producer<> FilterRowButton::removeRequests() const { - return _remove.clicks() | rpl::map([] { return rpl::empty_value(); }); + return _remove.clicks() | rpl::to_empty; } rpl::producer<> FilterRowButton::restoreRequests() const { - return _restore.clicks() | rpl::map([] { return rpl::empty_value(); }); + return _restore.clicks() | rpl::to_empty; } rpl::producer<> FilterRowButton::addRequests() const { - return _add.clicks() | rpl::map([] { return rpl::empty_value(); }); + return _add.clicks() | rpl::to_empty; } void FilterRowButton::paintEvent(QPaintEvent *e) { diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp index 2321c206e..58fcfd88b 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp @@ -556,7 +556,7 @@ object_ptr EditCloudPasswordBox(not_null session const auto box = result.data(); rpl::merge( - box->newPasswordSet() | rpl::map([] { return rpl::empty_value(); }), + box->newPasswordSet() | rpl::to_empty, box->passwordReloadNeeded() ) | rpl::start_with_next([=] { session->api().reloadPasswordState(); @@ -583,8 +583,7 @@ void RemoveCloudPassword(not_null<::Main::Session*> session) { const auto box = Ui::show(Box(session, fields)); rpl::merge( - box->newPasswordSet( - ) | rpl::map([] { return rpl::empty_value(); }), + box->newPasswordSet() | rpl::to_empty, box->passwordReloadNeeded() ) | rpl::start_with_next([=] { session->api().reloadPasswordState(); diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp index 4d4c335f4..05caa030a 100644 --- a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp +++ b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp @@ -93,15 +93,13 @@ void SeparatePanel::updateTitlePosition() { rpl::producer<> SeparatePanel::backRequests() const { return rpl::merge( - _back->entity()->clicks( - ) | rpl::map([] { return rpl::empty_value(); }), + _back->entity()->clicks() | rpl::to_empty, _synteticBackRequests.events()); } rpl::producer<> SeparatePanel::closeRequests() const { return rpl::merge( - _close->clicks( - ) | rpl::map([] { return rpl::empty_value(); }), + _close->clicks() | rpl::to_empty, _userCloseRequests.events()); } diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp index fb0c124e8..e485d7101 100644 --- a/Telegram/SourceFiles/window/window_filters_menu.cpp +++ b/Telegram/SourceFiles/window/window_filters_menu.cpp @@ -32,8 +32,7 @@ namespace { [[nodiscard]] rpl::producer MainListUnreadState( not_null list) { return rpl::single(rpl::empty_value()) | rpl::then( - list->unreadStateChanges( - ) | rpl::map([] { return rpl::empty_value(); }) + list->unreadStateChanges() | rpl::to_empty ) | rpl::map([=] { return list->unreadState(); }); diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp index 4ee071e5e..ff409bed1 100644 --- a/Telegram/SourceFiles/window/window_lock_widgets.cpp +++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp @@ -313,15 +313,11 @@ void TermsBox::prepare() { return false; } return true; - }) | rpl::map([] { - return rpl::empty_value(); - }) | rpl::start_to_stream(_agreeClicks, lifetime()); + }) | rpl::to_empty | rpl::start_to_stream(_agreeClicks, lifetime()); if (_cancel) { - addButton(std::move(_cancel), [=] {})->clicks( - ) | rpl::map([] { - return rpl::empty_value(); - }) | rpl::start_to_stream(_cancelClicks, lifetime()); + addButton(std::move(_cancel), [] {})->clicks( + ) | rpl::to_empty | rpl::start_to_stream(_cancelClicks, lifetime()); } if (age) { diff --git a/Telegram/SourceFiles/window/window_outdated_bar.cpp b/Telegram/SourceFiles/window/window_outdated_bar.cpp index 9108195f4..70fcebd1d 100644 --- a/Telegram/SourceFiles/window/window_outdated_bar.cpp +++ b/Telegram/SourceFiles/window/window_outdated_bar.cpp @@ -68,9 +68,7 @@ Bar::Bar(not_null parent, QDate date) } rpl::producer<> Bar::hideClicks() const { - return _close->clicks() | rpl::map([] { - return rpl::empty_value(); - }); + return _close->clicks() | rpl::to_empty; } int Bar::resizeGetHeight(int newWidth) { diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl index 6d6f69235..b58d2804a 160000 --- a/Telegram/lib_rpl +++ b/Telegram/lib_rpl @@ -1 +1 @@ -Subproject commit 6d6f692354b1b1d7b3808a01cc3337175ea5213d +Subproject commit b58d2804acda906119c53c1fa1a2593fa9895878