diff options
Diffstat (limited to 'src/bookmarks')
-rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 17 | ||||
-rw-r--r-- | src/bookmarks/bookmarksmanager.h | 6 |
2 files changed, 0 insertions, 23 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 57a29907..b5c90616 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -185,8 +185,6 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) } else { - UrlSearchItem urlSearchItem(UrlSearchItem::Bookmark, bookmark.url().prettyUrl() , bookmark.fullText(), QDateTime(), 1, bookmark.description(), QString()); - Application::bookmarkProvider()->completionObject()->addItem(urlSearchItem); return new KBookmarkAction(bookmark, owner(), this); } } @@ -250,13 +248,9 @@ BookmarkProvider::BookmarkProvider(QObject *parent) , m_manager(0) , m_owner(0) , m_actionCollection(new KActionCollection(this)) - , m_completion(0) , _bookmarkActionMenu(0) { kDebug() << "Loading Bookmarks Manager..."; - // take care of the completion object - m_completion = new AwesomeUrlCompletion; - m_completion->setOrder(KCompletion::Weighted); KUrl bookfile = KUrl("~/.kde/share/apps/konqueror/bookmarks.xml"); // share konqueror bookmarks @@ -296,8 +290,6 @@ BookmarkProvider::~BookmarkProvider() delete m_actionCollection; delete m_owner; delete m_manager; - - delete m_completion; } @@ -324,8 +316,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString Q_UNUSED(group) Q_UNUSED(caller) - m_completion->clear(); - foreach(KToolBar *bookmarkToolBar, m_bookmarkToolBars) { if (bookmarkToolBar) @@ -334,7 +324,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString fillBookmarkBar(bookmarkToolBar); } } - //TODO: also change completion object } @@ -429,12 +418,6 @@ KBookmarkGroup BookmarkProvider::rootGroup() } -AwesomeUrlCompletion *BookmarkProvider::completionObject() const -{ - return m_completion; -} - - QString BookmarkProvider::titleForBookmarkUrl(QString url) { QString title = ""; diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index 0915e894..d2465e77 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -228,11 +228,6 @@ public: inline BookmarkOwner *bookmarkOwner() { return m_owner; } - /** - * @returns the AwesomeUrlCompletion object. - */ - AwesomeUrlCompletion *completionObject() const; - QString titleForBookmarkUrl(QString url); void registerBookmarkPanel(BookmarksPanel *panel); @@ -278,7 +273,6 @@ private: KActionCollection *m_actionCollection; QList<KToolBar*> m_bookmarkToolBars; QList<BookmarksPanel*> m_bookmarkPanels; - AwesomeUrlCompletion *m_completion; KActionMenu *_bookmarkActionMenu; }; |