Rework of the TreeModel. This should finaliy *knock on wood* inconsitency issues.

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

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 6439233..5ff823a 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -27,6 +27,8 @@
 #include <QHash>
 #include <QAbstractItemModel>
 
+#include <QLinkedList> // needed for debug
+
 /*****************************************
  *  general item used in the Tree Model
  *****************************************/
@@ -38,14 +40,14 @@ public:
   AbstractTreeItem(AbstractTreeItem *parent = 0);
   virtual ~AbstractTreeItem();
 
-  void appendChild(int column, AbstractTreeItem *child);
-  void appendChild(AbstractTreeItem *child);
+  bool newChild(int column, AbstractTreeItem *child);
+  bool newChild(AbstractTreeItem *child);
   
-  void removeChild(int column, int row);
-  void removeChild(int row);
+  bool removeChild(int column, int row);
+  bool removeChild(int row);
 
-  void removeChildById(int column, const quint64 &id);
-  void removeChildById(const quint64 &id);
+  bool removeChildById(int column, const quint64 &id);
+  bool removeChildById(const quint64 &id);
   
   void removeAllChilds();
 
@@ -63,6 +65,7 @@ public:
   virtual int columnCount() const = 0;
 
   virtual QVariant data(int column, int role) const = 0;
+  virtual bool setData(int column, const QVariant &value, int role) = 0;
 
   virtual Qt::ItemFlags flags() const;
   virtual void setFlags(Qt::ItemFlags);
@@ -73,17 +76,15 @@ public:
 
 signals:
   void dataChanged(int column = -1);
-  void newChild(AbstractTreeItem *);
 
-  void beginRemoveChilds(int firstRow, int lastRow);
+  void beginAppendChilds(int column, int firstRow, int lastRow);
+  void endAppendChilds();
+  
+  void beginRemoveChilds(int column, int firstRow, int lastRow);
   void endRemoveChilds();
                                       
-private slots:
-  void childDestroyed();
-
 private:
   QHash<int, QList<AbstractTreeItem *> > _childItems;
-  QHash<int, QHash<quint64, AbstractTreeItem *> > _childHash; // uint to be compatible to qHash functions FIXME test this
   Qt::ItemFlags _flags;
 
   int defaultColumn() const;
@@ -99,7 +100,10 @@ class SimpleTreeItem : public AbstractTreeItem {
 public:
   SimpleTreeItem(const QList<QVariant> &data, AbstractTreeItem *parent = 0);
   virtual ~SimpleTreeItem();
+
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
   virtual int columnCount() const;
 
 private:
@@ -119,6 +123,8 @@ public:
   virtual ~PropertyMapItem();
   
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
   virtual int columnCount() const;
   
   void appendProperty(const QString &property);
@@ -138,13 +144,15 @@ public:
   TreeModel(const QList<QVariant> &, QObject *parent = 0);
   virtual ~TreeModel();
 
-  QVariant data(const QModelIndex &index, int role) const;
+  virtual QVariant data(const QModelIndex &index, int role) const;
+  virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
   virtual Qt::ItemFlags flags(const QModelIndex &index) const;
   QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
   
   QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
   QModelIndex indexById(quint64 id, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex indexByItem(AbstractTreeItem *item) const;
+  QModelIndex indexByItem(AbstractTreeItem *item, int column = 0) const;
 
   QModelIndex parent(const QModelIndex &index) const;
 
@@ -155,18 +163,30 @@ public:
 
 private slots:
   void itemDataChanged(int column = -1);
-  void newChild(AbstractTreeItem *child);
-
-  void beginRemoveChilds(int firstRow, int lastRow);
+  
+  void beginAppendChilds(int column, int firstRow, int lastRow);
+  void endAppendChilds();
+  
+  void beginRemoveChilds(int column, int firstRow, int lastRow);
   void endRemoveChilds();
   
 protected:
-  void appendChild(AbstractTreeItem *parent, AbstractTreeItem *child);
+  AbstractTreeItem *rootItem;
 
-  bool removeRow(int row, const QModelIndex &parent = QModelIndex());
-  bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+private:
+  void connectItem(AbstractTreeItem *item);
   
-  AbstractTreeItem *rootItem;
+  struct ChildStatus {
+    QModelIndex parent;
+    int childCount;
+    int start;
+    int end;
+    inline ChildStatus(QModelIndex parent_, int cc_, int s_, int e_) : parent(parent_), childCount(cc_), start(s_), end(e_) {};
+  };
+  ChildStatus _childStatus;
+  int _aboutToRemoveOrInsert;
+  // QLinkedList<ChildStatus> _childStatus;
+
 };
 
 #endif