X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.h;h=3a1c144e08462b1601f74c658564c5083a1d3424;hp=52ab5c5921397449971f6f1547c71e49dc4e6d1b;hb=56607f81246f04db3a0e71c9a8757d7f75d6cfcf;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 52ab5c59..3a1c144e 100644
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -27,60 +27,58 @@
 #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);
-  
-  void removeChild(int column, int row);
-  void removeChild(int row);
+  bool newChild(AbstractTreeItem *child);
+  bool newChilds(const QList<AbstractTreeItem *> &items);
+
+  bool removeChild(int row);
+  bool removeChildById(const quint64 &id);
+  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(const quint64 &id) const;
 
-  int childCount(int column) const;
   int childCount() const;
 
   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;
+
+  void dumpChildList();
 
 signals:
-  void dataChanged(int column);
-  void newChild(AbstractTreeItem *);
-  void childDestroyed(int row);
-				       
-private slots:
-  void childDestroyed();
+  void dataChanged(int column = -1);
 
+  void beginAppendChilds(int firstRow, int lastRow);
+  void endAppendChilds();
+  
+  void beginRemoveChilds(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;
+  QList<AbstractTreeItem *> _childItems;
   Qt::ItemFlags _flags;
-
-  int defaultColumn() const;
 };
 
 
@@ -93,7 +91,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:
@@ -113,6 +114,9 @@ public:
   virtual ~PropertyMapItem();
   
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
+  virtual QString toolTip(int column) const { Q_UNUSED(column) return QString(); }
   virtual int columnCount() const;
   
   void appendProperty(const QString &property);
@@ -132,12 +136,14 @@ 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 indexById(quint64 id, const QModelIndex &parent = QModelIndex()) const;
   QModelIndex indexByItem(AbstractTreeItem *item) const;
 
   QModelIndex parent(const QModelIndex &index) const;
@@ -148,17 +154,35 @@ public:
   virtual void clear();
 
 private slots:
-  void itemDataChanged(int column);
-  void newChild(AbstractTreeItem *child);
-  void childDestroyed(int row);
-
+  void itemDataChanged(int column = -1);
+  
+  void beginAppendChilds(int firstRow, int lastRow);
+  void endAppendChilds();
+  
+  void beginRemoveChilds(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;
+
+private slots:
+  void debug_rowsAboutToBeInserted(const QModelIndex &parent, int start, int end);
+  void debug_rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+  void debug_rowsInserted(const QModelIndex &parent, int start, int end);
+  void debug_rowsRemoved(const QModelIndex &parent, int start, int end);
 };
 
 #endif