File _service:tar_git:0002-Revert-Make-use-of-C-20-ranges-library.patch of Package angelfish

From 32811bb4bdd6f667f7fa16a41ff4639068283770 Mon Sep 17 00:00:00 2001
From: Rinigus <rinigus.git@gmail.com>
Date: Wed, 12 Apr 2023 22:02:30 +0300
Subject: [PATCH 2/2] Revert "Make use of C++20 ranges library"

This reverts commit e198907a5346690fff639e613e4e3b3bdae0c7a6.
---
 CMakeLists.txt                | 3 +--
 lib/tabsmodel.cpp             | 9 ++-------
 src/adblockurlinterceptor.cpp | 2 --
 src/main.cpp                  | 5 +----
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4967c9c..46c4728 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,8 @@ set(KF_MIN_VERSION "5.95.0")
 set(QT_MIN_VERSION "5.15.0")
 
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
 
 option(BUILD_TESTING "Build test programs" ON)
 
diff --git a/lib/tabsmodel.cpp b/lib/tabsmodel.cpp
index 93e8c90..5055454 100644
--- a/lib/tabsmodel.cpp
+++ b/lib/tabsmodel.cpp
@@ -15,13 +15,9 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-#include <ranges>
-
 #include "angelfishsettings.h"
 #include "browsermanager.h"
 
-namespace ranges = std::ranges;
-
 TabsModel::TabsModel(QObject *parent)
     : QAbstractListModel(parent)
 {
@@ -170,8 +166,7 @@ bool TabsModel::loadTabs()
         m_tabs.clear();
 
         const auto tabs = tabsStorage.value(QLatin1String("tabs")).toArray();
-
-        ranges::transform(tabs, std::back_inserter(m_tabs), [](const QJsonValue &tab) {
+        std::transform(tabs.begin(), tabs.end(), std::back_inserter(m_tabs), [](const QJsonValue &tab) {
             return TabState::fromJson(tab.toObject());
         });
 
@@ -212,7 +207,7 @@ bool TabsModel::saveTabs() const
         }
 
         QJsonArray tabsArray;
-        ranges::transform(m_tabs, std::back_inserter(tabsArray), [](const TabState &tab) {
+        std::transform(m_tabs.cbegin(), m_tabs.cend(), std::back_inserter(tabsArray), [](const TabState &tab) {
             return tab.toJson();
         });
 
diff --git a/src/adblockurlinterceptor.cpp b/src/adblockurlinterceptor.cpp
index ede3f4c..491a846 100644
--- a/src/adblockurlinterceptor.cpp
+++ b/src/adblockurlinterceptor.cpp
@@ -14,8 +14,6 @@
 
 #include "angelfishsettings.h"
 
-namespace ranges = std::ranges;
-
 Q_LOGGING_CATEGORY(AdblockCategory, "org.kde.angelfish.adblock", QtWarningMsg);
 
 #ifdef BUILD_ADBLOCK
diff --git a/src/main.cpp b/src/main.cpp
index 6950b80..8727c46 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,6 @@
 #include <KWindowSystem>
 
 #include <csignal>
-#include <ranges>
 
 #include "adblockfilterlistsmanager.h"
 #include "adblockfilterlistsmodel.h"
@@ -45,8 +44,6 @@
 #include "webappcreator.h"
 #include "webappmanagermodel.h"
 
-namespace ranges = std::ranges;
-
 constexpr auto APPLICATION_ID = "org.kde.angelfish";
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
@@ -117,7 +114,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
             // This should be initialPage->findChild<TabsModel *>(QStringLiteral("regularTabsObject")), for some reason
             // it doesn't find our tabsModel.
             const auto children = initialPage->children();
-            const auto *regularTabs = *ranges::find_if(children, [](const QObject *child) {
+            const auto *regularTabs = *std::find_if(children.cbegin(), children.cend(), [](const QObject *child) {
                 return child->objectName() == QStringLiteral("regularTabsObject");
             });
 
-- 
2.39.2