X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.h;h=8caffdd514b7449960fa5804e2758a66c667a061;hp=f7159fd420189239122d55959dc944f21e5e8987;hb=600a5683c1a8e679b7b63a00d5b1211b5b9771c7;hpb=6610ec52272c9cb9d30a992267331379ccbee77c

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index f7159fd4..8caffdd5 100644
--- 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,27 +40,19 @@ 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);
 
-  void removeChildById(int column, const quint64 &id);
-  void removeChildById(const quint64 &id);
-  
+  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 quint64 &id) const;
   AbstractTreeItem *childById(const quint64 &id) const;
 
-  int childCount(int column) const;
-  int childCount() const;
+  int childCount(int column = 0) const;
 
   virtual int columnCount() const = 0;
 
@@ -68,26 +62,23 @@ public:
   virtual Qt::ItemFlags flags() const;
   virtual void setFlags(Qt::ItemFlags);
 
-  int column() const;
   int row() const;
   AbstractTreeItem *parent() const;
 
+  void dumpChildList();
+
 signals:
   void dataChanged(int column = -1);
-  void newChild(AbstractTreeItem *);
 
+  void beginAppendChilds(int firstRow, int lastRow);
+  void endAppendChilds();
+  
   void beginRemoveChilds(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
+  QList<AbstractTreeItem *> _childItems;
   Qt::ItemFlags _flags;
-
-  int defaultColumn() const;
 };
 
 
@@ -125,6 +116,7 @@ public:
   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);
@@ -141,6 +133,11 @@ class TreeModel : public QAbstractItemModel {
   Q_OBJECT
 
 public:
+  enum myRoles {
+    SortRole = Qt::UserRole,
+    UserRole
+  };
+
   TreeModel(const QList<QVariant> &, QObject *parent = 0);
   virtual ~TreeModel();
 
@@ -163,18 +160,35 @@ public:
 
 private slots:
   void itemDataChanged(int column = -1);
-  void newChild(AbstractTreeItem *child);
-
+  
+  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);
+  void debug_dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
 };
 
 #endif