[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=781ba0c

The following commit has been merged in the master branch:
commit 781ba0c56e707f905dde2bc10a89e5b9e159a1f3
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 14:09:00 2012 +1100

    Made Conversation a metatype, so that it can be put in a QVariant directly.
---
 KTp/Declarative/conversation.h          | 2 ++
 KTp/Declarative/conversations-model.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 355ce71..94f3f01 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -55,4 +55,6 @@ private:
     ConversationPrivate *d;
 };
 
+Q_DECLARE_METATYPE(Conversation*);
+
 #endif // CONVERSATION_H
diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 6f230f2..3089287 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -36,7 +36,7 @@ QVariant ConversationsModel::data ( const QModelIndex& index, int role ) const
     QVariant result;
     if(index.row() >= 0 && index.row() < d->conversations.count()) {
         Q_ASSERT(role == ConversationRole);
-        result = QVariant::fromValue<QObject*>(d->conversations[index.row()]);
+        result = QVariant::fromValue<Conversation*>(d->conversations[index.row()]);
         kDebug() << "returning value " << result;
     }
     return result;

-- 
ktp-common-internals packaging