office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-13 13:11:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use the title to store the url because it will get mangled by KBoomark::fullText, use the url field

Browse source 
CCMAIL: 229141

svn path=/trunk/KDE/kdegraphics/okular/; revision=1108063
This commit is contained in:
Albert Astals Cid 2010-03-27 18:00:48 +00:00
parent 6623fcd4d8
commit 4a1d8bb025
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/bookmarkmanager.cpp
View file

@ -77,6 +77,12 @@ class BookmarkManager::Private : public KBookmarkOwner
QHash<KUrl, QString> knownFiles;
};
static inline KUrl urlForGroup(const KBookmark &group)
{
if ( group.url().isValid() ) return group.url();
else return KUrl( group.fullText() );
}
BookmarkManager::BookmarkManager( DocumentPrivate * document )
: QObject( document->m_parent ), d( new Private( this ) )
{
@ -146,7 +152,7 @@ void BookmarkManager::Private::_o_changed( const QString & groupAddress, const Q
if ( bm.isNull() )
return;
Q_ASSERT( bm.isGroup() );
referurl = KUrl( bm.fullText() );
referurl = urlForGroup( bm );
}
Q_ASSERT( referurl.isValid() );
emit q->bookmarksChanged( referurl );
@ -177,7 +183,7 @@ KUrl::List BookmarkManager::files() const
if ( bm.isSeparator() || !bm.isGroup() )
continue;
ret.append( KUrl( bm.fullText() ) );
ret.append( urlForGroup( bm ) );
}
return ret;
}
@ -188,7 +194,7 @@ KBookmark::List BookmarkManager::bookmarks( const KUrl& url ) const
KBookmarkGroup group = d->manager->root();
for ( KBookmark bm = group.first(); !bm.isNull(); bm = group.next( bm ) )
{
if ( !bm.isGroup() || KUrl( bm.fullText() ) != url )
if ( !bm.isGroup() || urlForGroup( bm ) != url )
continue;
KBookmarkGroup group = bm.toGroup();
@ -225,7 +231,7 @@ QHash<KUrl, QString>::iterator BookmarkManager::Private::bookmarkFind( const KUr
if ( bm.isSeparator() || !bm.isGroup() )
continue;
KUrl tmpurl( bm.fullText() );
KUrl tmpurl( urlForGroup( bm ) );
if ( tmpurl == url )
{
// got it! place it the hash of known files
@ -243,6 +249,7 @@ QHash<KUrl, QString>::iterator BookmarkManager::Private::bookmarkFind( const KUr
// then, in a single step create a new folder and add it in our cache :)
QString purl = url.isLocalFile() ? url.toLocalFile() : url.prettyUrl();
KBookmarkGroup newbg = root.createNewFolder( purl );
newbg.setUrl( url );
it = knownFiles.insert( url, newbg.address() );
if ( result )
*result = newbg;
@ -379,7 +386,7 @@ QList< QAction * > BookmarkManager::actionsForUrl( const KUrl& url ) const
KBookmarkGroup group = d->manager->root();
for ( KBookmark bm = group.first(); !bm.isNull(); bm = group.next( bm ) )
{
if ( !bm.isGroup() || KUrl( bm.fullText() ) != url )
if ( !bm.isGroup() || urlForGroup( bm ) != url )
continue;
KBookmarkGroup group = bm.toGroup();
@ -483,3 +490,5 @@ bool BookmarkManager::isBookmarked( int page ) const
#undef foreachObserverD
#include "bookmarkmanager.moc"
/* kate: replace-tabs on; indent-width 4; */