diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.cpp b/Telegram/SourceFiles/data/data_emoji_statuses.cpp index 25ea58aca0..a394edc0cc 100644 --- a/Telegram/SourceFiles/data/data_emoji_statuses.cpp +++ b/Telegram/SourceFiles/data/data_emoji_statuses.cpp @@ -172,7 +172,7 @@ void EmojiStatuses::requestProfilePhotoGroups() { const auto &data = group.data(); auto emoticons = ranges::views::all( data.vemoticons().v - ) | ranges::view::transform([](const MTPstring &emoticon) { + ) | ranges::views::transform([](const MTPstring &emoticon) { return qs(emoticon); }) | ranges::to_vector; result.push_back({ diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp index c268dad752..60c6e8191d 100644 --- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp +++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp @@ -523,9 +523,9 @@ void BottomInfo::layoutReactionsText() { _reactions.clear(); return; } - auto sorted = ranges::view::all( + auto sorted = ranges::views::all( _data.reactions - ) | ranges::view::transform([](const MessageReaction &reaction) { + ) | ranges::views::transform([](const MessageReaction &reaction) { return not_null{ &reaction }; }) | ranges::to_vector; ranges::sort( diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp index d6b42d9f06..ce84d5b45f 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp @@ -111,9 +111,9 @@ void InlineList::layoutButtons() { _buttons.clear(); return; } - auto sorted = ranges::view::all( + auto sorted = ranges::views::all( _data.reactions - ) | ranges::view::transform([](const MessageReaction &reaction) { + ) | ranges::views::transform([](const MessageReaction &reaction) { return not_null{ &reaction }; }) | ranges::to_vector; const auto &list = _owner->list(::Data::Reactions::Type::All); @@ -643,7 +643,7 @@ InlineListData InlineListDataFromMessage(not_null message) { result.recent.reserve(recent.size()); for (const auto &[id, list] : recent) { result.recent.emplace(id).first->second = list - | ranges::view::transform(&Data::RecentReaction::peer) + | ranges::views::transform(&Data::RecentReaction::peer) | ranges::to_vector; } } diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp index d767d3ec75..05769f5438 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp @@ -220,9 +220,9 @@ void Controller::showReaction(const ReactionId &reaction) { appendRow(peer, reaction); } } else { - _filtered = _all | ranges::view::filter([&](const AllEntry &entry) { + _filtered = _all | ranges::views::filter([&](const AllEntry &entry) { return (entry.second == reaction); - }) | ranges::view::transform( + }) | ranges::views::transform( &AllEntry::first ) | ranges::to_vector; for (const auto peer : _filtered) { diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index c6c27c1b19..c9ff2e5d7b 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -1053,7 +1053,7 @@ void FileLoadTask::process(Args &&args) { if (image->modifications.paint) { const auto documents = ExtractStickersFromScene(image); _result->attachedStickers = documents - | ranges::view::transform(&DocumentData::mtpInput) + | ranges::views::transform(&DocumentData::mtpInput) | ranges::to_vector; } }