[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=c4ad623

The following commit has been merged in the master branch:
commit c4ad623b42f3aa122c1c259537a1696ebd1bf8a8
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Feb 23 18:47:35 2015 +0100

    Fix warning by properly assigning a conversationsModel to the Pinned model
---
 KTp/Declarative/pinned-contacts-model.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index f32c4bc..2deefa9 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -236,9 +236,16 @@ void PinnedContactsModel::contactDataChanged()
 void PinnedContactsModel::setConversationsModel(ConversationsModel *model)
 {
     beginResetModel();
+    if (d->conversations) {
+        disconnect(d->conversations, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PinnedContactsModel::conversationsStateChanged);
+        disconnect(d->conversations, &QAbstractItemModel::rowsInserted, this, &PinnedContactsModel::conversationsStateChanged);
+    }
+
     d->conversations = model;
-    connect(d->conversations, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), SLOT(conversationsStateChanged(QModelIndex, int, int)));
-    connect(d->conversations, SIGNAL(rowsInserted(QModelIndex, int, int)), SLOT(conversationsStateChanged(QModelIndex, int, int)));
+    if (model) {
+        connect(d->conversations, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PinnedContactsModel::conversationsStateChanged);
+        connect(d->conversations, &QAbstractItemModel::rowsInserted, this, &PinnedContactsModel::conversationsStateChanged);
+    }
     endResetModel();
 }
 

-- 
ktp-common-internals packaging