X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fmodelpropertymapper.cpp;h=f4965d140cb456570ec93289428e144be78c8036;hb=ff87e964d7bd93f7a851d570c27b97943578a734;hp=32dfe7f6b5b9c799b0acf2ae77b11e2c1a915579;hpb=8699dd758516d0ded076811e8ea656adc95e69d0;p=quassel.git

diff --git a/src/client/modelpropertymapper.cpp b/src/client/modelpropertymapper.cpp
index 32dfe7f6..f4965d14 100644
--- a/src/client/modelpropertymapper.cpp
+++ b/src/client/modelpropertymapper.cpp
@@ -35,13 +35,13 @@ ModelPropertyMapper::~ModelPropertyMapper() {
 
 void ModelPropertyMapper::setModel(QAbstractItemModel *model) {
   if(_model) {
-    setSelectionModel(new QItemSelectionModel(model));
     disconnect(_model, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
 	       this, SLOT(dataChanged(QModelIndex, QModelIndex)));
   }
   _model = model;
   connect(_model, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
 	  this, SLOT(dataChanged(QModelIndex, QModelIndex)));
+  setSelectionModel(new QItemSelectionModel(model));
 }
 
 QAbstractItemModel *ModelPropertyMapper::model() const {
@@ -81,10 +81,12 @@ void ModelPropertyMapper::removeMapping(int column, int role, QObject *target, c
   }
   
   if(column == 0 && role == 0 && !property.isNull()) {
-    QList<Mapping>::iterator iter;
-    for(iter = _mappings.begin(); iter != _mappings.end(); iter++) {
+    QList<Mapping>::iterator iter = _mappings.begin();
+    while(iter != _mappings.end()) {
       if((*iter).target == target)
-	_mappings.erase(iter);
+	iter = _mappings.erase(iter);
+      else
+	iter++;
     }
     return;
   }
@@ -115,6 +117,5 @@ void ModelPropertyMapper::dataChanged(const QModelIndex &topLeft, const QModelIn
 }
 
 void ModelPropertyMapper::targetDestroyed() {
-  QObject *obj = static_cast<QObject *>(sender());
-  removeMapping(0, 0, obj, QByteArray());
+  removeMapping(0, 0, sender(), QByteArray());
 }