Refactoring the Tree- and Networkmodel (internal stuff only).

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

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 2a71576..5c23063 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -36,19 +36,11 @@ AbstractTreeItem::AbstractTreeItem(AbstractTreeItem *parent)
 AbstractTreeItem::~AbstractTreeItem() {
 }
 
 AbstractTreeItem::~AbstractTreeItem() {
 }
 

-quint64 AbstractTreeItem::id() const {
-  return qHash(this);
-}
-

 bool AbstractTreeItem::newChild(AbstractTreeItem *item) {
 bool AbstractTreeItem::newChild(AbstractTreeItem *item) {

-  // check if a child with that ID is already known
-  Q_ASSERT(childById(item->id()) == 0);
-    

   int newRow = childCount();
   emit beginAppendChilds(newRow, newRow);
   _childItems.append(item);
   emit endAppendChilds();
   int newRow = childCount();
   emit beginAppendChilds(newRow, newRow);
   _childItems.append(item);
   emit endAppendChilds();

-  

   return true;
 }
 
   return true;
 }
 


@@ -56,26 +48,11 @@ bool AbstractTreeItem::newChilds(const QList<AbstractTreeItem *> &items) {
   if(items.isEmpty())
     return false;
   
   if(items.isEmpty())
     return false;
   

-  QList<AbstractTreeItem *>::const_iterator itemIter = items.constBegin();
-  AbstractTreeItem *item;
-  while(itemIter != items.constEnd()) {
-    item = *itemIter;
-    if(childById(item->id()) != 0) {
-      qWarning() << "AbstractTreeItem::newChilds(): received child that is already attached" << item << item->id();
-      return false;
-    }
-    itemIter++;
-  }
-

   int nextRow = childCount();
   int lastRow = nextRow + items.count() - 1;
 
   emit beginAppendChilds(nextRow, lastRow);
   int nextRow = childCount();
   int lastRow = nextRow + items.count() - 1;
 
   emit beginAppendChilds(nextRow, lastRow);

-  itemIter = items.constBegin();
-  while(itemIter != items.constEnd()) {
-    _childItems.append(*itemIter);
-    itemIter++;
-  }
+  _childItems << items;

   emit endAppendChilds();
 
   return true;
   emit endAppendChilds();
 
   return true;


@@ -94,17 +71,6 @@ bool AbstractTreeItem::removeChild(int row) {
   return true;
 }
 
   return true;
 }
 

-bool AbstractTreeItem::removeChildById(const quint64 &id) {
-  const int numChilds = childCount();
-  
-  for(int i = 0; i < numChilds; i++) {
-    if(_childItems[i]->id() == id)
-      return removeChild(i);
-  }
-  
-  return false;
-}
-

 void AbstractTreeItem::removeAllChilds() {
   const int numChilds = childCount();
   
 void AbstractTreeItem::removeAllChilds() {
   const int numChilds = childCount();
   


@@ -164,15 +130,6 @@ AbstractTreeItem *AbstractTreeItem::child(int row) const {
     return _childItems[row];
 }
 
     return _childItems[row];
 }
 

-AbstractTreeItem *AbstractTreeItem::childById(const quint64 &id) const {
-  const int numChilds = childCount();
-  for(int i = 0; i < numChilds; i++) {
-    if(_childItems[i]->id() == id)
-      return _childItems[i];
-  }
-  return 0;
-}
-

 int AbstractTreeItem::childCount(int column) const {
   if(column > 0)
     return 0;
 int AbstractTreeItem::childCount(int column) const {
   if(column > 0)
     return 0;


@@ -192,26 +149,14 @@ int AbstractTreeItem::row() const {
   return row_;
 }
 
   return row_;
 }
 

-AbstractTreeItem *AbstractTreeItem::parent() const {
-  return qobject_cast<AbstractTreeItem *>(QObject::parent());
-}
-
-Qt::ItemFlags AbstractTreeItem::flags() const {
-  return _flags;
-}
-
-void AbstractTreeItem::setFlags(Qt::ItemFlags flags) {
-  _flags = flags;
-}
-

 void AbstractTreeItem::dumpChildList() {
 void AbstractTreeItem::dumpChildList() {

-  qDebug() << "==== Childlist for Item:" << this << id() << "====";
+  qDebug() << "==== Childlist for Item:" << this << "====";

   if(childCount() > 0) {
     AbstractTreeItem *child;
     QList<AbstractTreeItem *>::const_iterator childIter = _childItems.constBegin();
     while(childIter != _childItems.constEnd()) {
       child = *childIter;
   if(childCount() > 0) {
     AbstractTreeItem *child;
     QList<AbstractTreeItem *>::const_iterator childIter = _childItems.constBegin();
     while(childIter != _childItems.constEnd()) {
       child = *childIter;

-      qDebug() << "Row:" << child->row() << child << child->id() << child->data(0, Qt::DisplayRole);
+      qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);

       childIter++;
     }
   }
       childIter++;
     }
   }


@@ -355,22 +300,6 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con
     return QModelIndex();
 }
 
     return QModelIndex();
 }
 

-QModelIndex TreeModel::indexById(quint64 id, const QModelIndex &parent) const {
-  AbstractTreeItem *parentItem; 
-  
-  if(!parent.isValid())
-    parentItem = rootItem;
-  else
-    parentItem = static_cast<AbstractTreeItem *>(parent.internalPointer());
-  
-  AbstractTreeItem *childItem = parentItem->childById(id);
-  
-  if(childItem)
-    return createIndex(childItem->row(), 0, childItem);
-  else
-    return QModelIndex();
-}
-

 QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const {
   if(item == 0) {
     qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer";
 QModelIndex TreeModel::indexByItem(AbstractTreeItem *item) const {
   if(item == 0) {
     qWarning() << "TreeModel::indexByItem(AbstractTreeItem *item) received NULL-Pointer";


@@ -585,7 +514,7 @@ void TreeModel::debug_rowsAboutToBeRemoved(const QModelIndex &parent, int start,
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);

-    qDebug() << ">>>" << i << child << childItem->id() << child.data().toString();
+    qDebug() << ">>>" << i << child << child.data().toString();

   }
 }
 
   }
 }
 


@@ -602,7 +531,7 @@ void TreeModel::debug_rowsInserted(const QModelIndex &parent, int start, int end
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);
     child = parent.child(i, 0);
     childItem = parentItem->child(i);
     Q_ASSERT(childItem);

-    qDebug() << "<<<" << i << child << childItem->id() << child.data().toString();
+    qDebug() << "<<<" << i << child << child.data().toString();

   }
 }
 
   }
 }