[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f60356c

The following commit has been merged in the master branch:
commit f60356c98ee44f820711c8161844ae24933e8619
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Aug 9 10:31:54 2012 +0100

    Do not store Tp::Message internally in KTp::Message so that we can use the same class for loading backlog.
---
 lib/message.cpp | 12 +++++++-----
 lib/message.h   | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/message.cpp b/lib/message.cpp
index d0e62b4..9b6770b 100644
--- a/lib/message.cpp
+++ b/lib/message.cpp
@@ -20,8 +20,10 @@
 #include "message.h"
 #include <KDebug>
 
-Message::Message(const Tp::Message &original)
-    : m_originalMessage(original)
+Message::Message(const Tp::Message &original) :
+      m_sentTime(original.sent()),
+      m_token(original.messageToken()),
+      m_messageType(original.messageType())
 {
     setMainMessagePart(original.text());
 }
@@ -62,15 +64,15 @@ void Message::setProperty(const char *name, const QVariant& value)
 
 QDateTime Message::time() const
 {
-    return m_originalMessage.sent();
+    return m_sentTime;
 }
 
 QString Message::token() const
 {
-    return m_originalMessage.messageToken();
+    return m_token;
 }
 
 Tp::ChannelTextMessageType Message::type() const
 {
-    return m_originalMessage.messageType();
+    return m_messageType;
 }
diff --git a/lib/message.h b/lib/message.h
index df183f8..b74d325 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -95,15 +95,17 @@ public:
     QVariant property(const char *name) const;
     void setProperty(const char *name, const QVariant &value);
 
-    /*! 
eturn the timestamp from the internal Tp::Message */
+    /*! 
eturn the time the message was sent*/
     QDateTime time() const;
-    /*! 
eturn the unique token from the internal Tp::Message*/
+    /*! 
eturn the unique token from the message*/
     QString   token() const;
-    /*! 
eturn the type of the internal Tp::Message*/
+    /*! 
eturn the type of the message*/
     Tp::ChannelTextMessageType type() const;
 
 private:
-    Tp::Message m_originalMessage;
+    QDateTime   m_sentTime;
+    QString     m_token;
+    Tp::ChannelTextMessageType m_messageType;
     QVariantMap m_properties;
     QString     m_mainPart;
     QStringList m_parts;

-- 
ktp-text-ui packaging