From 85bc196887fbed01187e3830cd28c2500cb01cb2 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 26 Mar 2007 23:04:43 +0000 Subject: Ported to KBookmarkManager::closestBookmark - which even solves another TODO about code duplication. Improved urlnavigator API to avoid exposing the full QList (api independent from implementation now). svn path=/trunk/KDE/kdebase/apps/; revision=646954 --- src/bookmarkselector.cpp | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'src/bookmarkselector.cpp') diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 84ec0fc4e..1e4aaadc9 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -75,7 +75,7 @@ BookmarkSelector::~BookmarkSelector() void BookmarkSelector::updateSelection(const KUrl& url) { - KBookmark bookmark = baseBookmark(m_bookmarkManager, url); + KBookmark bookmark = m_bookmarkManager->root().closestBookmark(url); if (!bookmark.isNull()) { m_selectedAddress = bookmark.address(); setIcon(SmallIcon(bookmark.icon())); @@ -99,34 +99,6 @@ QSize BookmarkSelector::sizeHint() const return QSize(height, height); } -KBookmark BookmarkSelector::baseBookmark(KBookmarkManager* bookmarkManager, const KUrl& url) -{ - const KBookmarkGroup root = bookmarkManager->root(); - KBookmark bookmark = root.first(); - KBookmark foundBookmark; - - int maxLength = 0; - - // Search the bookmark which is equal to the Url or at least is a parent Url. - // If there are more than one possible parent Url candidates, choose the bookmark - // which covers the bigger range of the Url. - int i = 0; - while (!bookmark.isNull()) { - const KUrl bookmarkUrl = bookmark.url(); - if (bookmarkUrl.isParentOf(url)) { - const int length = bookmarkUrl.prettyUrl().length(); - if (length > maxLength) { - foundBookmark = bookmark; - maxLength = length; - } - } - bookmark = root.next(bookmark); - ++i; - } - - return foundBookmark; -} - void BookmarkSelector::paintEvent(QPaintEvent* /*event*/) { QPainter painter(this); -- cgit v1.3