Merging branches/0.2/@r859 with trunk

[quassel.git] / src / uisupport / bufferview.h

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index cb5a68d..b47904a 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -52,10 +52,11 @@ class BufferView : public QTreeView {
 
   public slots:
     void setRootIndexForNetworkId(const NetworkId &networkId);
-    void removeSelectedBuffers();
+    void removeSelectedBuffers(bool permanently = false);
 
   signals:
     void removeBuffer(const QModelIndex &);
+    void removeBufferPermanently(const QModelIndex &);
 
   protected:
     virtual void keyPressEvent(QKeyEvent *);
@@ -89,7 +90,8 @@ class BufferView : public QTreeView {
 
     QAction _joinBufferAction;
     QAction _partBufferAction;
-    QAction _hideBufferAction;
+    QAction _hideBufferTemporarilyAction;
+    QAction _hideBufferPermanentlyAction;
     QAction _removeBufferAction;
     QAction _ignoreListAction;