From d47d83c9ae484d489e3f3bb6be775e5bb002e0ab Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 14 May 2012 22:08:32 +0200 Subject: Let the places-item determine the group itself Related improvements: When loading the bookmarks assure in any case that items having the same group are inserted as one single group. --- src/panels/places/placesitemmodel.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/panels/places/placesitemmodel.h') diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 00bdb1c02..b7591f66a 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -72,12 +72,6 @@ public: */ int closestItem(const KUrl& url) const; - /** - * @return Name of the group where the item with the URL - * \a URL belongs to. - */ - QString groupName(const KUrl& url) const; - QAction* ejectAction(int index) const; QAction* teardownAction(int index) const; @@ -124,9 +118,7 @@ private: */ int hiddenIndex(int index) const; - static QString placesGroupName(); - static QString recentlyAccessedGroupName(); - static QString searchForGroupName(); + void removeHiddenItem(int index); #ifdef PLACESITEMMODEL_DEBUG void showModelState(); @@ -143,14 +135,12 @@ private: struct SystemBookmarkData { SystemBookmarkData(const KUrl& url, - const QString& icon, - const QString& text, - const QString& group) : - url(url), icon(icon), text(text), group(group) {} + const QString& icon, + const QString& text) : + url(url), icon(icon), text(text) {} KUrl url; QString icon; QString text; - QString group; }; QList m_systemBookmarks; -- cgit v1.3