Changeset View
Changeset View
Standalone View
Standalone View
core/bookmarkmanager.cpp
| Show First 20 Lines • Show All 275 Lines • ▼ Show 20 Line(s) | |||||
| 276 | { | 276 | { | ||
| 277 | return bookmarks( d->url ); | 277 | return bookmarks( d->url ); | ||
| 278 | } | 278 | } | ||
| 279 | 279 | | |||
| 280 | KBookmark::List BookmarkManager::bookmarks( int page ) const | 280 | KBookmark::List BookmarkManager::bookmarks( int page ) const | ||
| 281 | { | 281 | { | ||
| 282 | const KBookmark::List bmarks = bookmarks(); | 282 | const KBookmark::List bmarks = bookmarks(); | ||
| 283 | KBookmark::List ret; | 283 | KBookmark::List ret; | ||
| 284 | foreach( const KBookmark &bm, bmarks ) | 284 | for ( const KBookmark &bm : bmarks ) | ||
| 285 | { | 285 | { | ||
| 286 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | 286 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | ||
| 287 | if ( vp.isValid() && vp.pageNumber == page ) | 287 | if ( vp.isValid() && vp.pageNumber == page ) | ||
| 288 | { | 288 | { | ||
| 289 | ret.append(bm); | 289 | ret.append(bm); | ||
| 290 | } | 290 | } | ||
| 291 | } | 291 | } | ||
| 292 | 292 | | |||
| 293 | return ret; | 293 | return ret; | ||
| 294 | } | 294 | } | ||
| 295 | 295 | | |||
| 296 | KBookmark BookmarkManager::bookmark( int page ) const | 296 | KBookmark BookmarkManager::bookmark( int page ) const | ||
| 297 | { | 297 | { | ||
| 298 | const KBookmark::List bmarks = bookmarks(); | 298 | const KBookmark::List bmarks = bookmarks(); | ||
| 299 | foreach( const KBookmark &bm, bmarks ) | 299 | for ( const KBookmark &bm : bmarks ) | ||
| 300 | { | 300 | { | ||
| 301 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | 301 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | ||
| 302 | if ( vp.isValid() && vp.pageNumber == page ) | 302 | if ( vp.isValid() && vp.pageNumber == page ) | ||
| 303 | { | 303 | { | ||
| 304 | return bm; | 304 | return bm; | ||
| 305 | } | 305 | } | ||
| 306 | } | 306 | } | ||
| 307 | return KBookmark(); | 307 | return KBookmark(); | ||
| ▲ Show 20 Lines • Show All 239 Lines • ▼ Show 20 Line(s) | 544 | { | |||
| 547 | 547 | | |||
| 548 | KBookmarkGroup thebg; | 548 | KBookmarkGroup thebg; | ||
| 549 | QHash<QUrl, QString>::iterator it = d->bookmarkFind( referurl, false, &thebg ); | 549 | QHash<QUrl, QString>::iterator it = d->bookmarkFind( referurl, false, &thebg ); | ||
| 550 | if ( it == d->knownFiles.end() ) | 550 | if ( it == d->knownFiles.end() ) | ||
| 551 | return; | 551 | return; | ||
| 552 | 552 | | |||
| 553 | const QHash<int,int> oldUrlBookmarks = d->urlBookmarks; | 553 | const QHash<int,int> oldUrlBookmarks = d->urlBookmarks; | ||
| 554 | bool deletedAny = false; | 554 | bool deletedAny = false; | ||
| 555 | foreach ( const KBookmark & bm, list ) | 555 | for ( const KBookmark &bm : list ) | ||
| 556 | { | 556 | { | ||
| 557 | if ( bm.parentGroup() == thebg ) | 557 | if ( bm.parentGroup() == thebg ) | ||
| 558 | { | 558 | { | ||
| 559 | thebg.deleteBookmark( bm ); | 559 | thebg.deleteBookmark( bm ); | ||
| 560 | deletedAny = true; | 560 | deletedAny = true; | ||
| 561 | 561 | | |||
| 562 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | 562 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | ||
| 563 | if ( referurl == d->document->m_url ) | 563 | if ( referurl == d->document->m_url ) | ||
| ▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s) | |||||
| 703 | } | 703 | } | ||
| 704 | 704 | | |||
| 705 | KBookmark BookmarkManager::nextBookmark( const DocumentViewport &viewport) const | 705 | KBookmark BookmarkManager::nextBookmark( const DocumentViewport &viewport) const | ||
| 706 | { | 706 | { | ||
| 707 | KBookmark::List bmarks = bookmarks(); | 707 | KBookmark::List bmarks = bookmarks(); | ||
| 708 | std::sort(bmarks.begin(), bmarks.end(), bookmarkLessThan); | 708 | std::sort(bmarks.begin(), bmarks.end(), bookmarkLessThan); | ||
| 709 | 709 | | |||
| 710 | KBookmark bookmark; | 710 | KBookmark bookmark; | ||
| 711 | foreach ( const KBookmark &bm, bmarks ) | 711 | for ( const KBookmark &bm : qAsConst(bmarks) ) | ||
| 712 | { | 712 | { | ||
| 713 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | 713 | DocumentViewport vp( bm.url().fragment(QUrl::FullyDecoded) ); | ||
| 714 | if ( viewport < vp ) | 714 | if ( viewport < vp ) | ||
| 715 | { | 715 | { | ||
| 716 | bookmark = bm; | 716 | bookmark = bm; | ||
| 717 | break; | 717 | break; | ||
| 718 | } | 718 | } | ||
| 719 | } | 719 | } | ||
| Show All 30 Lines | |||||