[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fce5a53

The following commit has been merged in the master branch:
commit fce5a536149cdaaa5945da423570e331207c5d27
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 1 16:59:59 2013 +0000

    Fix crash in AbstractGroupingModel when used in a tree
    
    When removing a proxy item, remove children of that item from the proxy map
    
    BUG: 322134
    REVIEW: 112430
---
 KTp/Models/abstract-grouping-proxy-model.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/KTp/Models/abstract-grouping-proxy-model.cpp b/KTp/Models/abstract-grouping-proxy-model.cpp
index 6978d92..9da6ccc 100644
--- a/KTp/Models/abstract-grouping-proxy-model.cpp
+++ b/KTp/Models/abstract-grouping-proxy-model.cpp
@@ -223,6 +223,13 @@ void KTp::AbstractGroupingProxyModel::removeProxyNodes(const QModelIndex &source
 {
     Q_FOREACH(ProxyNode *proxy, removedItems) {
         QStandardItem *parentItem = proxy->parent();
+
+        //also remove child items of this proxy node from the proxy map
+        for (int i = 0 ; i < d->source->rowCount(sourceIndex) ; i++) {
+            //we always remove child(0) because we're deleting the first child each time
+            removeProxyNodes(sourceIndex.child(i,0), QList<ProxyNode*>() << dynamic_cast<ProxyNode*>(proxy->child(0)));
+        }
+
         parentItem->removeRow(proxy->row());
         d->proxyMap.remove(sourceIndex, proxy);
 

-- 
ktp-common-internals packaging