[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=649162c

The following commit has been merged in the master branch:
commit 649162c4f5e35c197f4d5cd0f955fe0ab269d549
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Mar 2 00:30:17 2013 -0500

    Implement KTp::Message::operator=()
    
    While I blame Jetlag, I'm still frustrated it made me waste half a
    day by giving compiler errors in QSharedDataPointer.
---
 KTp/message.cpp | 8 +++++++-
 KTp/message.h   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 5db2f25..b6a4254 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -34,7 +34,8 @@ class Message::Private : public QSharedData {
   public:
     Private() :
         isHistory(false)
-    {};
+    {}
+
     QDateTime   sentTime;
     QString     token;
     Tp::ChannelTextMessageType messageType;
@@ -46,6 +47,11 @@ class Message::Private : public QSharedData {
     MessageDirection direction;
 };
 
+Message& Message::operator=(const Message &other) {
+    d = other.d;
+    return *this;
+}
+
 Message::Message(const Tp::Message &original, const KTp::MessageContext &context) :
     d(new Private)
 {
diff --git a/KTp/message.h b/KTp/message.h
index 02098cc..983f1c6 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -28,6 +28,7 @@
 #include <KTp/ktp-export.h>
 #include <KTp/message-context.h>
 
+#include <QSharedData>
 #include <QSharedDataPointer>
 
 namespace KTp
@@ -57,6 +58,7 @@ class KTP_EXPORT Message
     };
 
     Message(const KTp::Message &other);
+    KTp::Message& operator=(const KTp::Message &other);
     virtual ~Message();
 
     /*! rief The body of the message

-- 
ktp-common-internals packaging