From 0475cb6bfca254e51f5e98d018f0b2a0e6535024 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Wed, 24 Mar 2010 22:58:51 +0100
Subject: Revert "derivation of the lastbar branch: UltimateLastBar :)"

This reverts commit f45e39322dd7561bc1cd2756b4c9223bc586425b.
---
 src/bookmarks/bookmarksmanager.cpp | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/bookmarks/bookmarksmanager.cpp')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index c97b46af..cfe26a55 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -161,12 +161,7 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
         , m_actionCollection(new KActionCollection(this))
         , m_bookmarkMenu(0)
         , m_bookmarkToolBar(0)
-        , m_completion(0)
 {
-    // take care of the completion object
-    m_completion = new KCompletion;
-    m_completion->setOrder( KCompletion::Weighted );
-
     KUrl bookfile = KUrl("~/.kde/share/apps/konqueror/bookmarks.xml");  // share konqueror bookmarks
 
     if (!QFile::exists(bookfile.path()))
@@ -225,7 +220,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
         return;
 
     m_bookmarkToolBar->clear(); // FIXME CRASH
-    m_completion->clear();
 
     KBookmark bookmark = toolBarGroup.first();
     while (!bookmark.isNull())
@@ -291,8 +285,7 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
         return a;
     }
     else
-    {        
-        m_completion->addItem(bookmark.url().path());
+    {
         return new KBookmarkAction(bookmark, m_owner, this);
     }
 }
@@ -302,14 +295,3 @@ KBookmarkGroup BookmarkProvider::rootGroup()
 {
     return m_manager->root();
 }
-
-KCompletion *BookmarkProvider::completionObject() const
-{
-    return m_completion;
-}
-
-
-KBookmarkManager *BookmarkProvider::bookmarkManager()
-{ 
-    return m_manager; 
-}
-- 
cgit v1.2.1