[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=1b13dc5

The following commit has been merged in the master branch:
commit 1b13dc58e38efcec74515b71db0efbb567f9ac4f
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Feb 14 11:11:46 2012 +1100

    Add new role to MessagesModel called 'continuing'
    
    Boolean returns true if message is sequential. i.e. if the same user
    said something the previous line.
---
 KTp/Declarative/messages-model.cpp | 9 +++++++++
 KTp/Declarative/messages-model.h   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index d1eb7b2..cb3daf0 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -62,6 +62,7 @@ MessagesModel::MessagesModel(QObject *parent):
     roles[TextRole] = "text";
     roles[TimeRole] = "time";
     roles[TypeRole] = "type";
+    roles[ContinuingRole] = "continuing";
     setRoleNames(roles);
 
     d->visible = false;
@@ -201,6 +202,14 @@ QVariant MessagesModel::data(const QModelIndex& index, int role) const
         case TimeRole:
             result = requestedData->time;
             break;
+        case ContinuingRole:
+            if(index.row() > 0 &&
+                d->messages[index.row() - 1].user == requestedData->user) {
+                    result = true;
+            } else {
+                result = false;
+            }
+            break;
         };
     } else {
         kError() << "Attempting to access data at invalid index (" << index << ")";
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 233bbfb..4df6d11 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -40,7 +40,8 @@ public:
         UserRole = Qt::UserRole,
         TextRole,
         TypeRole,
-        TimeRole
+        TimeRole,
+        ContinuingRole //FIXME: Come up with a better name for this
     };
 
     enum MessageType {

-- 
ktp-common-internals packaging