[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=1ce6497

The following commit has been merged in the master branch:
commit 1ce64979bc9bb2c3074c4e602ad8d8df48448545
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Feb 2 17:09:33 2013 +0000

    D pointer message context
---
 KTp/{message-context.h => message-context.cpp} | 46 ++++++++++++++------------
 KTp/message-context.h                          | 20 ++++++-----
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/KTp/message-context.h b/KTp/message-context.cpp
similarity index 62%
copy from KTp/message-context.h
copy to KTp/message-context.cpp
index 007b247..d04f2de 100644
--- a/KTp/message-context.h
+++ b/KTp/message-context.cpp
@@ -16,33 +16,35 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef KTP_MESSAGE_CONTEXT_H
-#define KTP_MESSAGE_CONTEXT_H
+#include "message-context.h"
 
-#include <TelepathyQt/Account>
-#include <TelepathyQt/TextChannel>
+namespace KTp {
+class MessageContext::Private {
+public:
+    Tp::AccountPtr account;
+    Tp::TextChannelPtr channel;
+};
+}
 
-namespace KTp
+KTp::MessageContext::MessageContext(const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel) :
+    d(new Private)
 {
+    d->account = account;
+    d->channel = channel;
+}
 
-class KTP_EXPORT MessageContext
+KTp::MessageContext::~MessageContext()
 {
-public:
-    MessageContext(const Tp::AccountPtr &_account, const Tp::TextChannelPtr &_channel) :
-        account(_account),
-        channel(_channel)
-    {
-    }
-
-    /** Account in which the message is sent
-    */
-    Tp::AccountPtr account;
+    delete d;
+}
 
-    /** Channel in which the message was sent
-     @warning this may be null, and should be checked before use
-    */
-    Tp::TextChannelPtr channel;
-};
+Tp::AccountPtr KTp::MessageContext::account() const
+{
+    return d->account;
+}
 
+Tp::TextChannelPtr KTp::MessageContext::channel() const
+{
+    return d->channel;
 }
-#endif // MESSAGECONTEXT_H
+
diff --git a/KTp/message-context.h b/KTp/message-context.h
index 007b247..60bfc7c 100644
--- a/KTp/message-context.h
+++ b/KTp/message-context.h
@@ -22,26 +22,30 @@
 #include <TelepathyQt/Account>
 #include <TelepathyQt/TextChannel>
 
+#include "ktp-export.h"
+
 namespace KTp
 {
 
 class KTP_EXPORT MessageContext
 {
 public:
-    MessageContext(const Tp::AccountPtr &_account, const Tp::TextChannelPtr &_channel) :
-        account(_account),
-        channel(_channel)
-    {
-    }
+    MessageContext(const Tp::AccountPtr &_account, const Tp::TextChannelPtr &_channel);
+    
+    virtual ~MessageContext();
 
     /** Account in which the message is sent
     */
-    Tp::AccountPtr account;
+    Tp::AccountPtr account() const;
 
     /** Channel in which the message was sent
-     @warning this may be null, and should be checked before use
+     @warning this may be null, and should always be checked before use
     */
-    Tp::TextChannelPtr channel;
+    Tp::TextChannelPtr channel() const;
+    
+private:
+    class Private;
+    Private *d;
 };
 
 }

-- 
ktp-common-internals packaging