From 3bf68fd71492f02bffb6cf040e9471c5e997180e Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 14 Dec 2017 12:35:44 -0300 Subject: Make sure that old URLs do not appear duplicated in places model Summary: BUG: 389401 KIO model now provides Baloo URLs; we need to remove the old ones created by Dolphin places model BUG: 387888 Depends on D9332 Test Plan: unit test Reviewers: mwolff, #dolphin, ngraham, elvisangelaccio Reviewed By: #dolphin, ngraham, elvisangelaccio Subscribers: elvisangelaccio, broulik, ervin, ngraham, #dolphin Differential Revision: https://phabricator.kde.org/D9333 --- src/panels/places/placesitemmodel.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/panels/places/placesitemmodel.h') diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index c8830ee6f..a1b23b220 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -168,17 +168,16 @@ private slots: private: /** - * Loads the bookmarks from the bookmark-manager and creates items for - * the model or moves hidden items to m_bookmarkedItems. + * Remove bookmarks created by the previous version of dolphin that are + * not valid anymore */ - void loadBookmarks(); + void cleanupBookmarks(); /** - * @return True, if the bookmark can be accepted in the context of the - * current application (e.g. bookmarks from other applications - * will be ignored). + * Loads the bookmarks from the bookmark-manager and creates items for + * the model or moves hidden items to m_bookmarkedItems. */ - bool acceptBookmark(const KBookmark& bookmark) const; + void loadBookmarks(); QString internalMimeType() const; -- cgit v1.3