[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=61dca56

The following commit has been merged in the master branch:
commit 61dca566ffe9fff50a94a066120884ecdc15c5ac
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Apr 17 16:36:22 2012 +0200

    Improve and simplify Chat Delegates
    
    Changes the TextDelegate to just display the text messages, puts the name on the section delegate
    For outgoing chats, leaves the same text color and puts a background color to differenciate
    
    REVIEW: 104635
---
 KTp/Declarative/messages-model.cpp | 9 ---------
 KTp/Declarative/messages-model.h   | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 92cd930..a097150 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -62,7 +62,6 @@ MessagesModel::MessagesModel(QObject *parent):
     roles[TextRole] = "text";
     roles[TimeRole] = "time";
     roles[TypeRole] = "type";
-    roles[ContinuingRole] = "continuing";
     setRoleNames(roles);
 
     d->visible = false;
@@ -204,14 +203,6 @@ 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 4df6d11..233bbfb 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -40,8 +40,7 @@ public:
         UserRole = Qt::UserRole,
         TextRole,
         TypeRole,
-        TimeRole,
-        ContinuingRole //FIXME: Come up with a better name for this
+        TimeRole
     };
 
     enum MessageType {

-- 
ktp-common-internals packaging