wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port away from qFind, qCopy, qLowerBound, qUpperBound

Browse Source
remotes/origin/more-conventional-sidebar
Albert Astals Cid 7 years ago
parent d4c2b9a55c
commit 18e11fc5e4
2 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      ui/formwidgets.cpp
  2. 8
      ui/pageview.cpp

11
ui/formwidgets.cpp
Unescape View File

@ -106,12 +106,13 @@ void FormWidgetsController::registerRadioButton( FormWidgetIface *fwButton, Okul
m_buttons.insert( id, button ); m_buttons.insert( id, button );
for ( ; it != itEnd; ++it ) for ( ; it != itEnd; ++it )
{ {
const QList< int >::const_iterator idsIt = qFind( (*it).ids, id ); const RadioData &rd = *it;
if ( idsIt != (*it).ids.constEnd() ) 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; qCDebug(OkularUiDebug) << "Adding id" << id << "To group including" << rd.ids;
(*it).group->addButton( button ); rd.group->addButton( button );
(*it).group->setId( button, id ); rd.group->setId( button, id );
return; return;
} }
} }

8
ui/pageview.cpp
Unescape View File

@ -1366,7 +1366,7 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
QSet< AnnotWindow * >::Iterator it = d->m_annowindows.begin(); QSet< AnnotWindow * >::Iterator it = d->m_annowindows.begin();
for ( ; it != d->m_annowindows.end(); ) 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 ) if ( annIt != annItEnd )
{ {
(*it)->reloadInfo(); (*it)->reloadInfo();
@ -4010,7 +4010,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
const float zoomFactorFitWidth = zoomFactorFitMode(ZoomFitWidth); const float zoomFactorFitWidth = zoomFactorFitMode(ZoomFitWidth);
const float zoomFactorFitPage = zoomFactorFitMode(ZoomFitPage); const float zoomFactorFitPage = zoomFactorFitMode(ZoomFitPage);
QVector<float> zoomValue(15); QVector<float> zoomValue(15);
qCopy(kZoomValues, kZoomValues + 13, zoomValue.begin()); std::copy(kZoomValues, kZoomValues + 13, zoomValue.begin());
zoomValue[13] = zoomFactorFitWidth; zoomValue[13] = zoomFactorFitWidth;
zoomValue[14] = zoomFactorFitPage; zoomValue[14] = zoomFactorFitPage;
std::sort(zoomValue.begin(), zoomValue.end()); std::sort(zoomValue.begin(), zoomValue.end());
@ -4019,13 +4019,13 @@ void PageView::updateZoom( ZoomMode newZoomMode )
{ {
if (newFactor <= zoomValue.first()) if (newFactor <= zoomValue.first())
return; return;
i = qLowerBound(zoomValue.begin(), zoomValue.end(), newFactor) - 1; i = std::lower_bound(zoomValue.begin(), zoomValue.end(), newFactor) - 1;
} }
else else
{ {
if (newFactor >= zoomValue.last()) if (newFactor >= zoomValue.last())
return; return;
i = qUpperBound(zoomValue.begin(), zoomValue.end(), newFactor); i = std::upper_bound(zoomValue.begin(), zoomValue.end(), newFactor);
} }
const float tmpFactor = *i; const float tmpFactor = *i;
if ( tmpFactor == zoomFactorFitWidth ) if ( tmpFactor == zoomFactorFitWidth )

Write Preview
Loading…
Cancel
Save