From 6b68d001aeba7497c72eaecdaf529ba850251d29 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 13 Mar 2021 22:07:29 +0400 Subject: [PATCH] Get rid of deprecated ranges::action --- Telegram/SourceFiles/calls/calls_call.cpp | 2 +- Telegram/SourceFiles/core/application.cpp | 2 +- Telegram/SourceFiles/data/stickers/data_stickers.cpp | 2 +- Telegram/SourceFiles/history/history_inner_widget.cpp | 6 +++--- .../info/polls/info_polls_results_inner_widget.cpp | 4 ++-- Telegram/SourceFiles/support/support_templates.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index f244fe0c7..2c2269329 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -142,7 +142,7 @@ uint64 ComputeFingerprint(bytes::const_span authKey) { } [[nodiscard]] QVector CollectVersionsForApi() { - return WrapVersions(tgcalls::Meta::Versions() | ranges::action::reverse); + return WrapVersions(tgcalls::Meta::Versions() | ranges::actions::reverse); } [[nodiscard]] Webrtc::VideoState StartVideoState(bool enabled) { diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index c1eea20a1..4139ee015 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -1022,7 +1022,7 @@ void Application::unregisterLeaveSubscription(not_null widget) { #ifdef Q_OS_MAC _leaveSubscriptions = std::move( _leaveSubscriptions - ) | ranges::action::remove_if([&](const LeaveSubscription &subscription) { + ) | ranges::actions::remove_if([&](const LeaveSubscription &subscription) { auto pointer = subscription.pointer.data(); return !pointer || (pointer == widget); }); diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp index cad684d5e..d2a062206 100644 --- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp +++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp @@ -1093,7 +1093,7 @@ std::vector> Stickers::getListByEmoji( } } - ranges::action::sort( + ranges::actions::sort( result, std::greater<>(), &StickerWithDate::date); diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 2a7f1ab18..acadfbc67 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -2628,14 +2628,14 @@ MessageIdsList HistoryInner::getSelectedItems() const { auto result = ranges::make_subrange( _selected.begin(), _selected.end() - ) | view::filter([](const auto &selected) { + ) | views::filter([](const auto &selected) { const auto item = selected.first; return item && item->toHistoryMessage() && (item->id > 0); - }) | view::transform([](const auto &selected) { + }) | views::transform([](const auto &selected) { return selected.first->fullId(); }) | to_vector; - result |= action::sort(ordered_less{}, [](const FullMsgId &msgId) { + result |= actions::sort(ordered_less{}, [](const FullMsgId &msgId) { return msgId.channel ? msgId.msg : (msgId.msg - ServerMaxMsgId); }); return result; diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp index 7fd591eef..0aaa2477e 100644 --- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp +++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp @@ -317,14 +317,14 @@ void ListController::collapse() { return; } const auto remove = count - (kFirstPage - kLeavePreloaded); - ranges::action::reverse(_preloaded); + ranges::actions::reverse(_preloaded); _preloaded.reserve(_preloaded.size() + remove); for (auto i = 0; i != remove; ++i) { const auto row = delegate()->peerListRowAt(count - i - 1); _preloaded.push_back(row->peer()->asUser()); delegate()->peerListRemoveRow(row); } - ranges::action::reverse(_preloaded); + ranges::actions::reverse(_preloaded); delegate()->peerListRefreshRows(); const auto now = count - remove; diff --git a/Telegram/SourceFiles/support/support_templates.cpp b/Telegram/SourceFiles/support/support_templates.cpp index f62b2f615..bb2512605 100644 --- a/Telegram/SourceFiles/support/support_templates.cpp +++ b/Telegram/SourceFiles/support/support_templates.cpp @@ -734,7 +734,7 @@ auto Templates::query(const QString &text) const -> std::vector { pairById ) | ranges::views::filter([](const Pair &pair) { return pair.second > 0; - }) | ranges::to_vector | ranges::action::stable_sort(sorter); + }) | ranges::to_vector | ranges::actions::stable_sort(sorter); return good | ranges::views::transform([&](const Pair &pair) { return questionById(pair.first); }) | ranges::views::take(kQueryLimit) | ranges::to_vector;