Started to reorganize the Buffer{Model|View|Filter}. Mostly cleanup at the moment.

[quassel.git] / src / client / buffertreemodel.h

diff --git a/src/client/buffertreemodel.h b/src/client/buffertreemodel.h
index 3f4e597..602cf57 100644 (file)
--- a/src/client/buffertreemodel.h
+++ b/src/client/buffertreemodel.h
@@ -24,6 +24,7 @@
 #include <QtCore>
 
 #include "treemodel.h"
+class BufferInfo;
 #include "buffer.h"
 
 /*****************************************
@@ -36,12 +37,13 @@ public:
   BufferTreeItem(Buffer *, TreeItem *parent = 0);
 
   virtual uint id() const;
-  
   QVariant data(int column, int role) const;
+  virtual Qt::ItemFlags flags() const;
+  
   Buffer *buffer() const { return buf; }
   void setActivity(const Buffer::ActivityLevel &);
   
-protected:
+private:
   QString text(int column) const;
   QColor foreground(int column) const;
   
@@ -59,6 +61,7 @@ public:
   NetworkTreeItem(const QString &, TreeItem *parent = 0);
 
   virtual uint id() const;
+  virtual Qt::ItemFlags flags() const;
   
 private:
   QString net;
@@ -72,29 +75,26 @@ class BufferTreeModel : public TreeModel {
   Q_OBJECT
   
 public:
-  enum  myRoles {
+  enum myRoles {
     BufferTypeRole = Qt::UserRole,
     BufferActiveRole,
     BufferNameRole,
-    BufferIdRole
+    BufferUidRole
   };
   
   BufferTreeModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
-
-  virtual Qt::ItemFlags flags(const QModelIndex &index) const;
   
 public slots:
   void bufferUpdated(Buffer *);    
   void changeCurrent(const QModelIndex &, const QModelIndex &);
   void selectBuffer(Buffer *buffer);
-  void doubleClickReceived(const QModelIndex &);
   void bufferActivity(Buffer::ActivityLevel, Buffer *buffer);
   
 signals:
   void bufferSelected(Buffer *);
   void invalidateFilter();
-  void fakeUserInput(BufferId, QString);
+  void fakeUserInput(BufferInfo, QString);
   void selectionChanged(const QModelIndex &);
     
 private: