X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.h;h=8caffdd514b7449960fa5804e2758a66c667a061;hp=55dafac57ce9695b2af089c5d08ede7be8885651;hb=99bb37d9938f3d88ce7551ded454146359fadc03;hpb=d424e746952f9821cf1c015f4b0fad0e1b169680

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 55dafac5..8caffdd5 100644
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -40,27 +40,19 @@ public:
   AbstractTreeItem(AbstractTreeItem *parent = 0);
   virtual ~AbstractTreeItem();
 
-  bool newChild(int column, AbstractTreeItem *child);
   bool newChild(AbstractTreeItem *child);
-  
-  bool removeChild(int column, int row);
-  bool removeChild(int row);
+  bool newChilds(const QList<AbstractTreeItem *> &items);
 
-  bool removeChildById(int column, 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;
 
@@ -70,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 beginAppendChilds(int column, int firstRow, int lastRow);
+  void beginAppendChilds(int firstRow, int lastRow);
   void endAppendChilds();
   
-  void beginRemoveChilds(int column, int firstRow, int lastRow);
+  void beginRemoveChilds(int firstRow, int lastRow);
   void endRemoveChilds();
 				       
 private:
-  QHash<int, QList<AbstractTreeItem *> > _childItems;
+  QList<AbstractTreeItem *> _childItems;
   Qt::ItemFlags _flags;
-
-  int defaultColumn() const;
 };
 
 
@@ -144,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();
 
@@ -155,7 +149,7 @@ public:
   
   QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
   QModelIndex indexById(quint64 id, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex indexByItem(AbstractTreeItem *item, int column = 0) const;
+  QModelIndex indexByItem(AbstractTreeItem *item) const;
 
   QModelIndex parent(const QModelIndex &index) const;
 
@@ -167,10 +161,10 @@ public:
 private slots:
   void itemDataChanged(int column = -1);
   
-  void beginAppendChilds(int column, int firstRow, int lastRow);
+  void beginAppendChilds(int firstRow, int lastRow);
   void endAppendChilds();
   
-  void beginRemoveChilds(int column, int firstRow, int lastRow);
+  void beginRemoveChilds(int firstRow, int lastRow);
   void endRemoveChilds();
   
 protected:
@@ -188,8 +182,13 @@ private:
   };
   ChildStatus _childStatus;
   int _aboutToRemoveOrInsert;
-  // QLinkedList<ChildStatus> _childStatus;
 
+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