From 18e11fc5e402130cefdee10c6967348b080ea9cb Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 23 Jul 2019 17:30:44 +0200
Subject: [PATCH] Port away from qFind, qCopy, qLowerBound, qUpperBound

---
 ui/formwidgets.cpp | 11 ++++++-----
 ui/pageview.cpp    |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ui/formwidgets.cpp b/ui/formwidgets.cpp
index 4289d8bc3..a46a5258f 100644
--- a/ui/formwidgets.cpp
+++ b/ui/formwidgets.cpp
@@ -106,12 +106,13 @@ void FormWidgetsController::registerRadioButton( FormWidgetIface *fwButton, Okul
     m_buttons.insert( id, button );
     for ( ; it != itEnd; ++it )
     {
-        const QList< int >::const_iterator idsIt = qFind( (*it).ids, id );
-        if ( idsIt != (*it).ids.constEnd() )
+        const RadioData &rd = *it;
+        const QList< int >::const_iterator idsIt = std::find( rd.ids.begin(), rd.ids.end(), id );
+        if ( idsIt != rd.ids.constEnd() )
         {
-            qCDebug(OkularUiDebug) << "Adding id" << id << "To group including" << (*it).ids;
-            (*it).group->addButton( button );
-            (*it).group->setId( button, id );
+            qCDebug(OkularUiDebug) << "Adding id" << id << "To group including" << rd.ids;
+            rd.group->addButton( button );
+            rd.group->setId( button, id );
             return;
         }
     }
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index b7de931a1..4f3ef642f 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -1366,7 +1366,7 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
         QSet< AnnotWindow * >::Iterator it = d->m_annowindows.begin();
         for ( ; it != d->m_annowindows.end(); )
         {
-            QLinkedList< Okular::Annotation * >::ConstIterator annIt = qFind( annots, (*it)->annotation() );
+            QLinkedList< Okular::Annotation * >::ConstIterator annIt = std::find( annots.begin(), annots.end(), (*it)->annotation() );
             if ( annIt != annItEnd )
             {
                 (*it)->reloadInfo();
@@ -4010,7 +4010,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
             const float zoomFactorFitWidth = zoomFactorFitMode(ZoomFitWidth);
             const float zoomFactorFitPage = zoomFactorFitMode(ZoomFitPage);
             QVector<float> zoomValue(15);
-            qCopy(kZoomValues, kZoomValues + 13, zoomValue.begin());
+            std::copy(kZoomValues, kZoomValues + 13, zoomValue.begin());
             zoomValue[13] = zoomFactorFitWidth;
             zoomValue[14] = zoomFactorFitPage;
             std::sort(zoomValue.begin(), zoomValue.end());
@@ -4019,13 +4019,13 @@ void PageView::updateZoom( ZoomMode newZoomMode )
             {
                 if (newFactor <= zoomValue.first())
                     return;
-                i = qLowerBound(zoomValue.begin(), zoomValue.end(), newFactor) - 1;
+                i = std::lower_bound(zoomValue.begin(), zoomValue.end(), newFactor) - 1;
             }
             else
             {
                 if (newFactor >= zoomValue.last())
                     return;
-                i = qUpperBound(zoomValue.begin(), zoomValue.end(), newFactor);
+                i = std::upper_bound(zoomValue.begin(), zoomValue.end(), newFactor);
             }
             const float tmpFactor = *i;
             if ( tmpFactor == zoomFactorFitWidth )