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 0d23405..5ff823a 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -27,30 +27,37 @@
 #include <QHash>
 #include <QAbstractItemModel>
 
+#include <QLinkedList> // needed for debug
+
 /*****************************************
  *  general item used in the Tree Model
  *****************************************/
 class AbstractTreeItem : public QObject {
   Q_OBJECT
-  Q_PROPERTY(uint id READ id)
+  Q_PROPERTY(quint64 id READ id)
 
 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);
+  
+  bool removeChild(int column, int row);
+  bool removeChild(int row);
+
+  bool removeChildById(int column, const quint64 &id);
+  bool removeChildById(const quint64 &id);
   
-  void removeChild(int column, int row);
-  void removeChild(int row);
+  void removeAllChilds();
 
   virtual quint64 id() const;
 
   AbstractTreeItem *child(int column, int row) const;
   AbstractTreeItem *child(int row) const;
   
-  AbstractTreeItem *childById(int column, const uint &id) const;
-  AbstractTreeItem *childById(const uint &id) const;
+  AbstractTreeItem *childById(int column, const quint64 &id) const;
+  AbstractTreeItem *childById(const quint64 &id) const;
 
   int childCount(int column) const;
   int childCount() const;
@@ -58,24 +65,26 @@ 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);
 
   int column() const;
   int row() const;
-  AbstractTreeItem *parent();
+  AbstractTreeItem *parent() const;
 
 signals:
-  void dataChanged(int column);
-                                      
-private slots:
-  void childDestroyed();
+  void dataChanged(int column = -1);
 
+  void beginAppendChilds(int column, int firstRow, int lastRow);
+  void endAppendChilds();
+  
+  void beginRemoveChilds(int column, int firstRow, int lastRow);
+  void endRemoveChilds();
+                                      
 private:
   QHash<int, QList<AbstractTreeItem *> > _childItems;
-  QHash<int, QHash<quint64, AbstractTreeItem *> > _childHash; // uint to be compatible to qHash functions
-  AbstractTreeItem *_parentItem;
   Qt::ItemFlags _flags;
 
   int defaultColumn() const;
@@ -91,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:
@@ -111,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);
@@ -130,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(uint id, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex indexByItem(AbstractTreeItem *item) const;
+  QModelIndex indexById(quint64 id, const QModelIndex &parent = QModelIndex()) const;
+  QModelIndex indexByItem(AbstractTreeItem *item, int column = 0) const;
 
   QModelIndex parent(const QModelIndex &index) const;
 
@@ -146,15 +162,31 @@ public:
   virtual void clear();
 
 private slots:
-  void itemDataChanged(int column);
-
+  void itemDataChanged(int column = -1);
+  
+  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