Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 18e11fc5 authored by Albert Astals Cid's avatar Albert Astals Cid

Port away from qFind, qCopy, qLowerBound, qUpperBound

parent d4c2b9a5
......@@ -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;
}
}
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment