Get rid of deprecated ranges::action

This commit is contained in:
Ilya Fedin 2021-03-13 22:07:29 +04:00 committed by John Preston
parent ae0b9141dd
commit 6b68d001ae
6 changed files with 9 additions and 9 deletions

View file

@ -142,7 +142,7 @@ uint64 ComputeFingerprint(bytes::const_span authKey) {
} }
[[nodiscard]] QVector<MTPstring> CollectVersionsForApi() { [[nodiscard]] QVector<MTPstring> CollectVersionsForApi() {
return WrapVersions(tgcalls::Meta::Versions() | ranges::action::reverse); return WrapVersions(tgcalls::Meta::Versions() | ranges::actions::reverse);
} }
[[nodiscard]] Webrtc::VideoState StartVideoState(bool enabled) { [[nodiscard]] Webrtc::VideoState StartVideoState(bool enabled) {

View file

@ -1022,7 +1022,7 @@ void Application::unregisterLeaveSubscription(not_null<QWidget*> widget) {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
_leaveSubscriptions = std::move( _leaveSubscriptions = std::move(
_leaveSubscriptions _leaveSubscriptions
) | ranges::action::remove_if([&](const LeaveSubscription &subscription) { ) | ranges::actions::remove_if([&](const LeaveSubscription &subscription) {
auto pointer = subscription.pointer.data(); auto pointer = subscription.pointer.data();
return !pointer || (pointer == widget); return !pointer || (pointer == widget);
}); });

View file

@ -1093,7 +1093,7 @@ std::vector<not_null<DocumentData*>> Stickers::getListByEmoji(
} }
} }
ranges::action::sort( ranges::actions::sort(
result, result,
std::greater<>(), std::greater<>(),
&StickerWithDate::date); &StickerWithDate::date);

View file

@ -2628,14 +2628,14 @@ MessageIdsList HistoryInner::getSelectedItems() const {
auto result = ranges::make_subrange( auto result = ranges::make_subrange(
_selected.begin(), _selected.begin(),
_selected.end() _selected.end()
) | view::filter([](const auto &selected) { ) | views::filter([](const auto &selected) {
const auto item = selected.first; const auto item = selected.first;
return item && item->toHistoryMessage() && (item->id > 0); return item && item->toHistoryMessage() && (item->id > 0);
}) | view::transform([](const auto &selected) { }) | views::transform([](const auto &selected) {
return selected.first->fullId(); return selected.first->fullId();
}) | to_vector; }) | 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 msgId.channel ? msgId.msg : (msgId.msg - ServerMaxMsgId);
}); });
return result; return result;

View file

@ -317,14 +317,14 @@ void ListController::collapse() {
return; return;
} }
const auto remove = count - (kFirstPage - kLeavePreloaded); const auto remove = count - (kFirstPage - kLeavePreloaded);
ranges::action::reverse(_preloaded); ranges::actions::reverse(_preloaded);
_preloaded.reserve(_preloaded.size() + remove); _preloaded.reserve(_preloaded.size() + remove);
for (auto i = 0; i != remove; ++i) { for (auto i = 0; i != remove; ++i) {
const auto row = delegate()->peerListRowAt(count - i - 1); const auto row = delegate()->peerListRowAt(count - i - 1);
_preloaded.push_back(row->peer()->asUser()); _preloaded.push_back(row->peer()->asUser());
delegate()->peerListRemoveRow(row); delegate()->peerListRemoveRow(row);
} }
ranges::action::reverse(_preloaded); ranges::actions::reverse(_preloaded);
delegate()->peerListRefreshRows(); delegate()->peerListRefreshRows();
const auto now = count - remove; const auto now = count - remove;

View file

@ -734,7 +734,7 @@ auto Templates::query(const QString &text) const -> std::vector<Question> {
pairById pairById
) | ranges::views::filter([](const Pair &pair) { ) | ranges::views::filter([](const Pair &pair) {
return pair.second > 0; 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 good | ranges::views::transform([&](const Pair &pair) {
return questionById(pair.first); return questionById(pair.first);
}) | ranges::views::take(kQueryLimit) | ranges::to_vector; }) | ranges::views::take(kQueryLimit) | ranges::to_vector;