From f7c85b42252c7c17255f9f56639f1e95992dfeed Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Thu, 19 Feb 2015 20:05:55 +0100 Subject: Sync bookmark manager only if the change was done by the current process Adoption of http://commits.kde.org/kdelibs/2b5c6e42fc8114c6854ce490b9cdd4356be683d9 FIXED-IN: 14.12.3 BUG: 343620 BUG: 310080 REVIEW: 122640 --- src/panels/places/placesitemmodel.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src/panels/places/placesitemmodel.h') diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 4a374e502..7cbf99e95 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -124,6 +124,14 @@ public: static KUrl convertedUrl(const KUrl& url); virtual void clear(); + + /** + * Saves the bookmarks and indicates to other applications that the + * state of the bookmarks has been changed. Is only called by the + * timeout of m_saveBookmarksTimer to prevent unnecessary savings. + */ + void saveBookmarks(); + signals: void errorMessage(const QString& message); void storageSetupDone(int index, bool success); @@ -147,12 +155,6 @@ private slots: */ void updateBookmarks(); - /** - * Saves the bookmarks and indicates to other applications that the - * state of the bookmarks has been changed. Is only called by the - * timeout of m_saveBookmarksTimer to prevent unnecessary savings. - */ - void saveBookmarks(); private: struct SystemBookmarkData; @@ -199,12 +201,6 @@ private: */ void hideItem(int index); - /** - * Triggers a delayed saving of bookmarks by starting - * m_saveBookmarksTimer. - */ - void triggerBookmarksSaving(); - QString internalMimeType() const; /** @@ -287,7 +283,6 @@ private: // removing an item is not allowed. int m_hiddenItemToRemove; - QTimer* m_saveBookmarksTimer; QTimer* m_updateBookmarksTimer; QHash m_storageSetupInProgress; -- cgit v1.3.1