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

The following commit has been merged in the master branch:
commit e277ad25df8b76d331986685d96269ee2542c9fd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jan 31 14:08:39 2012 +0000

    Fix warnings in conversation model
---
 KTp/Declarative/conversations-model.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 332d76a..ad13f67 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -46,15 +46,17 @@ QVariant ConversationsModel::data(const QModelIndex& index, int role) const
 {
     QVariant result;
     if (index.isValid()) {
-        Q_ASSERT(role == ConversationRole);
-        result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
-        kDebug() << "returning value " << result;
+        if (role == ConversationRole) {
+            result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
+            kDebug() << "returning value " << result;
+        }
     }
     return result;
 }
 
 int ConversationsModel::rowCount(const QModelIndex& parent) const
 {
+    Q_UNUSED(parent);
     return d->conversations.count();
 }
 

-- 
ktp-common-internals packaging