diff options
author | megabigbug <megabigbug@arrakis.(none)> | 2010-03-24 22:58:51 +0100 |
---|---|---|
committer | megabigbug <megabigbug@arrakis.(none)> | 2010-03-24 22:58:51 +0100 |
commit | 0475cb6bfca254e51f5e98d018f0b2a0e6535024 (patch) | |
tree | b1d3d5e3b5ee4b346e247d26c58005e8da14bbb8 /src/bookmarks/bookmarksmanager.cpp | |
parent | derivation of the lastbar branch: UltimateLastBar :) (diff) | |
download | rekonq-0475cb6bfca254e51f5e98d018f0b2a0e6535024.tar.xz |
Revert "derivation of the lastbar branch: UltimateLastBar :)"
This reverts commit f45e39322dd7561bc1cd2756b4c9223bc586425b.
Diffstat (limited to 'src/bookmarks/bookmarksmanager.cpp')
-rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
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; -} |