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

The following commit has been merged in the master branch:
commit dd56616592de787d1ef2a943a4af5a0bf8b3576e
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 19:49:52 2012 +1100

    Changed implementations of QAbstractItemModel::data() to use QModelIndex::isValid().
---
 KTp/Declarative/conversations-model.cpp | 2 +-
 KTp/Declarative/messages-model.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 6de4ff8..514e1da 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -34,7 +34,7 @@ public:
 QVariant ConversationsModel::data(const QModelIndex& index, int role) const
 {
     QVariant result;
-    if (index.row() >= 0 && index.row() < d->conversations.count()) {
+    if (index.isValid()) {
         Q_ASSERT(role == ConversationRole);
         result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
         kDebug() << "returning value " << result;
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index bbc4da9..bb1f025 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -180,7 +180,7 @@ QVariant MessagesModel::data(const QModelIndex& index, int role) const
 {
     QVariant result;
 
-    if (index.row() < d->messages.size()) {
+    if (index.isValid()) {
         MessageItem* requestedData = &d->messages[index.row()];
 
         switch (role) {

-- 
ktp-common-internals packaging