summaryrefslogtreecommitdiff
path: root/src/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/bookmarksmanager.cpp20
-rw-r--r--src/bookmarks/bookmarksmanager.h10
2 files changed, 2 insertions, 28 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;
-}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index d6b8f8e0..d4afb997 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -39,7 +39,6 @@
// KDE Includes
#include <KBookmarkOwner>
-#include <KCompletion>
// Forward Declarations
class BookmarkProvider;
@@ -211,13 +210,7 @@ public:
*/
KBookmarkGroup rootGroup();
- KBookmarkManager *bookmarkManager();
-
- /**
- * @returns the KCompletion object.
- */
- KCompletion *completionObject() const;
-
+ KBookmarkManager *bookmarkManager() { return m_manager; }
signals:
/**
* @short This signal is emitted when an url has to be loaded
@@ -252,7 +245,6 @@ private:
KActionCollection *m_actionCollection;
BookmarkMenu *m_bookmarkMenu;
KToolBar *m_bookmarkToolBar;
- KCompletion *m_completion;
};
#endif