[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=561f5c2

The following commit has been merged in the master branch:
commit 561f5c2f2a78c073f7ecb92863de318598a9b780
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 1 23:17:19 2012 +0000

    Various cleanup in lib/message
---
 KTp/message.cpp | 26 +++++++++++++++++---------
 KTp/message.h   | 12 +++++++-----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 163ed7c..0e11dd2 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -20,12 +20,15 @@
 #include "message.h"
 #include <KDebug>
 
+#include <QtGui/QTextDocument> //needed for Qt::escape
+
+
 using namespace KTp;
 
-Message::Message(Tp::Message &original)
-    : originalMessage(original)
+Message::Message(const Tp::Message &original)
+    : m_originalMessage(original)
 {
-    QString htmlMessage= Qt::escape(originalMessage.text());
+    QString htmlMessage= Qt::escape(m_originalMessage.text());
     htmlMessage.replace(QLatin1String("
 "), QLatin1String("<br/> ")); //keep leading whitespaces
     htmlMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
     htmlMessage.replace(QLatin1Char('	'), QLatin1String("    ")); // replace tabs by 4 spaces
@@ -37,27 +40,32 @@ Message::Message(Tp::Message &original)
 
 QString Message::mainMessagePart() const
 {
-    return content[Message::MainMessage];
+    return m_content[Message::MainMessage];
 }
 
 void Message::setMainMessagePart(const QString& message)
 {
-    content[Message::MainMessage] = message;
+    m_content[Message::MainMessage] = message;
 }
 
 void Message::appendMessagePart(const QString& part)
 {
-    content << part;
+    m_content << part;
 }
 
 QString Message::finalizedMessage() const
 {
-    QString msg = content.join(QLatin1String("
"));
+    QString msg = m_content.join(QLatin1String("
"));
     kDebug() << msg;
     return msg;
 }
 
-QVariantMap& Message::miscData()
+QVariant Message::property(const QString &name) const
+{
+    return m_properties[name];
+}
+
+void KTp::Message::setProperty(const QString &name, const QVariant &value)
 {
-    return m_miscData;
+    m_properties[name]=value;
 }
diff --git a/KTp/message.h b/KTp/message.h
index c4a1aae..1ccdd41 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -27,7 +27,7 @@ namespace KTp {
 class Message {
 
 public:
-    Message(Tp::Message& original);
+    Message(const Tp::Message& original);
 
     QString mainMessagePart() const;
     void setMainMessagePart(const QString& message);
@@ -35,11 +35,13 @@ public:
 
     QString finalizedMessage() const;
 
-    QVariantMap& miscData();
+    QVariant property(const QString &name) const;
+    void setProperty(const QString &name, const QVariant &value);
+
 private:
-    Tp::Message originalMessage;
-    QVariantMap m_miscData;
-    QStringList content;
+    Tp::Message m_originalMessage;
+    QVariantMap m_properties;
+    QStringList m_content;
 
     enum MessageParts {
         MainMessage = 0

-- 
ktp-common-internals packaging