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

The following commit has been merged in the master branch:
commit 13254383a84581f86114d1e2ff4df7727108a719
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 13 15:27:46 2012 +1100

    Move MessageItem::MessageType to MessagesModel
---
 KTp/Declarative/messages-model.cpp | 14 ++++----------
 KTp/Declarative/messages-model.h   |  8 ++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 0070c83..d1eb7b2 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -33,15 +33,9 @@ public:
     QString text;
     QDateTime time;
     QString id;
+    MessagesModel::MessageType type;
 
-    //FIXME : replace with Tp::ChannelTextMessageType
-    enum MessageType {
-        Incoming,
-        Outgoing,
-        Status
-    } type;
-
-    MessageItem(QString user, QString text, QDateTime time, MessageType type, QString messageId)
+    MessageItem(QString user, QString text, QDateTime time, MessagesModel::MessageType type, QString messageId)
             : user(user), text(text), time(time), id(messageId), type(type) {
         if (this->text.endsWith(QLatin1String("
"))) {
             this->text.chop(1);
@@ -146,7 +140,7 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
                                message.sender()->alias(),
                                MessageProcessor::instance()->processIncomingMessage(message).finalizedMessage(),
                                message.received(),
-                               MessageItem::Incoming,
+                               MessagesModel::MessageTypeIncoming,
                                message.messageToken()
                            ));
 
@@ -175,7 +169,7 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
                            i18n("Me"),   //FIXME : use actual nickname from Tp::AccountPtr
                            MessageProcessor::instance()->processOutgoingMessage(message).finalizedMessage(),
                            message.sent(),
-                           MessageItem::Outgoing,
+                           MessagesModel::MessageTypeOutgoing,
                            message.messageToken()
                        ));
 
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index eeeae20..233bbfb 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -28,6 +28,7 @@
 class MessagesModel : public QAbstractListModel, public Queable
 {
     Q_OBJECT
+    Q_ENUMS(MessageType)
     Q_PROPERTY(bool visibleToUser READ isVisibleToUser WRITE setVisibleToUser NOTIFY visibleToUserChanged);
     Q_PROPERTY(int unreadCount READ unreadCount NOTIFY unreadCountChanged);
 
@@ -42,6 +43,13 @@ public:
         TimeRole
     };
 
+    enum MessageType {
+        MessageTypeIncoming,
+        MessageTypeOutgoing,
+        MessageTypeAction,
+        MessageTypeNotice
+    };
+
     virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
 

-- 
ktp-common-internals packaging