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

The following commit has been merged in the master branch:
commit a031a1870b7048a17dfc5717eca786da374cafb6
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 14 22:53:48 2013 +0100

    Expose senderId, senderAlias and senderAvatar properties in MessageModel
    
    Also remove rather ambiguous UserRole which used to have sender alias
    
    REVIEW: 110016
---
 KTp/Declarative/messages-model.cpp | 29 ++++++++++++++++++++---------
 KTp/Declarative/messages-model.h   | 10 ++++++----
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 2c15c27..6889e3a 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2011  Lasath Fernando <kde at lasath.org>
+    Copyright (C) 2013  Lasath Fernando <davidedmundson at kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -44,10 +45,12 @@ MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
     kDebug();
 
     QHash<int, QByteArray> roles;
-    roles[UserRole] = "user";
     roles[TextRole] = "text";
     roles[TimeRole] = "time";
     roles[TypeRole] = "type";
+    roles[SenderIdRole] = "senderId";
+    roles[SenderAliasRole] = "senderAlias";
+    roles[SenderAvatarRole] = "senderAvatar";
     setRoleNames(roles);
 
     d->account = account;
@@ -166,20 +169,17 @@ QVariant MessagesModel::data(const QModelIndex &index, int role) const
     QVariant result;
 
     if (index.isValid()) {
-        KTp::Message requestedData = d->messages[index.row()];
+        const KTp::Message message = d->messages[index.row()];
 
         switch (role) {
-        case UserRole:
-            result = requestedData.senderAlias();
-            break;
         case TextRole:
-            result = requestedData.finalizedMessage();
+            result = message.finalizedMessage();
             break;
         case TypeRole:
-            if (requestedData.type() == Tp::ChannelTextMessageTypeAction) {
+            if (message.type() == Tp::ChannelTextMessageTypeAction) {
                 result = MessageTypeAction;
             } else {
-                if (requestedData.direction() == KTp::Message::LocalToRemote) {
+                if (message .direction() == KTp::Message::LocalToRemote) {
                     result = MessageTypeOutgoing;
                 } else {
                     result = MessageTypeIncoming;
@@ -187,7 +187,18 @@ QVariant MessagesModel::data(const QModelIndex &index, int role) const
             }
             break;
         case TimeRole:
-            result = requestedData.time();
+            result = message.time();
+            break;
+        case SenderIdRole:
+            result = message.senderId();
+            break;
+        case SenderAliasRole:
+            result = message.senderAlias();
+            break;
+        case SenderAvatarRole:
+            if (message.sender()) {
+                result = QVariant::fromValue(message.sender()->avatarData());
+            }
             break;
         };
     } else {
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 83d8792..57f67c3 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -41,10 +41,12 @@ class MessagesModel : public QAbstractListModel, public Queueable
     virtual ~MessagesModel();
 
     enum Roles {
-        UserRole = Qt::UserRole,
-        TextRole,
-        TypeRole,
-        TimeRole
+        TextRole = Qt::UserRole, //String
+        TypeRole, //MessagesModel::MessageType (for now!)
+        TimeRole, //QDateTime
+        SenderIdRole, //string
+        SenderAliasRole, //string
+        SenderAvatarRole //pixmap
     };
 
     enum MessageType {

-- 
ktp-common-internals packaging