Merge branch 'master' of git.kde.org:rekonq

1 files changed, 12 insertions, 9 deletions

diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index f042d4c8..be797502 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -52,27 +52,30 @@ public:
     virtual ~BookmarksPanel();
 
 public Q_SLOTS:
-    void startLoadFoldedState();
+    void loadFoldedState();
+
+Q_SIGNALS:
+    void expansionChanged();
 
 private Q_SLOTS:
     void contextMenu(const QPoint &pos);
-    virtual void contextMenuItem(const QPoint &pos);
-    virtual void contextMenuGroup(const QPoint &pos);
-    virtual void contextMenuEmpty(const QPoint &pos);
+
+    virtual void contextMenuItem  (const QPoint &pos) {contextMenu(pos);}
+    virtual void contextMenuGroup (const QPoint &pos) {contextMenu(pos);}
+    virtual void contextMenuEmpty (const QPoint &pos) {contextMenu(pos);}
 
     void deleteBookmark();
     void onCollapse(const QModelIndex &index);
     void onExpand(const QModelIndex &index);
-    void loadFoldedState(const QModelIndex &root);
-
-Q_SIGNALS:
-    void expansionChanged();
 
 private:
     virtual void setup();
+
+    void loadFoldedState(const QModelIndex &root);
+
     KBookmark bookmarkForIndex(const QModelIndex &index);
 
-    virtual QAbstractItemModel* getModel();
+    virtual QAbstractItemModel* model();
 
     BookmarksTreeModel *_bkTreeModel;
     bool _loadingState;