[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=7057ed1

The following commit has been merged in the master branch:
commit 7057ed17ffeb839571fe2d7b75eb27a471bb8620
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 12:44:59 2012 +1100

    Parented MessagesModel and ConversationTarget properly, so that Conversation doesn't have to explicitly delete them.
---
 KTp/Declarative/conversation-target.cpp | 5 +++--
 KTp/Declarative/conversation-target.h   | 2 +-
 KTp/Declarative/conversation.cpp        | 9 ++++-----
 KTp/Declarative/conversation.h          | 8 +++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 184deea..c8be71b 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -28,8 +28,9 @@ public:
     Tp::ContactPtr contact;
 };
 
-ConversationTarget::ConversationTarget(Tp::ContactPtr contact) :
-        d(new ConversationTargetPrivate)
+ConversationTarget::ConversationTarget(Tp::ContactPtr contact, QObject* parent) :
+    QObject(parent),
+    d(new ConversationTargetPrivate)
 {
     kDebug();
 
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index 225f29f..139c007 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -39,7 +39,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationTarget : public QObject
     Q_PROPERTY(QString id READ id)
 
 public:
-    ConversationTarget(Tp::ContactPtr contact = Tp::ContactPtr());
+    ConversationTarget(Tp::ContactPtr contact, QObject* parent = 0);
     virtual ~ConversationTarget();
 
     QIcon   avatar() const;
diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 99a77e1..4ca65b4 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -32,15 +32,16 @@ public:
 //     Tp::AccountPtr account;
 };
 
-Conversation::Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account) :
+Conversation::Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent) :
+        QObject(parent),
         d (new ConversationPrivate)
 {
     kDebug();
 
-    d->model = new MessagesModel();
+    d->model = new MessagesModel(this);
     d->model->setTextChannel(channel);
 
-    d->target = new ConversationTarget(channel->targetContact());
+    d->target = new ConversationTarget(channel->targetContact(), this);
 
 //     connect(model(), SIGNAL(unreadCountChanged(int)), SLOT(onUnreadMessagesChanged()));
 //     d->account = account;
@@ -75,7 +76,5 @@ ConversationTarget* Conversation::target() const
 Conversation::~Conversation()
 {
     kDebug();
-    delete d->model;
-    delete d->target;
     delete d;
 }
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index ef1e207..355ce71 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -28,19 +28,21 @@
 // #include "conversation-model.h"
 #include <KIcon>
 #include "conversation-que-manager.h"
+#include "conversation-target.h"
 
-class ConversationTarget;
+// class ConversationTarget;
 class MessagesModel;
 class KDE_TELEPATHY_CHAT_EXPORT Conversation : public QObject
 {
 Q_OBJECT
 
-Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
+// Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
+Q_PROPERTY(QObject* target READ target CONSTANT);
 //TODO: rename this to messages
 Q_PROPERTY(MessagesModel* model READ model CONSTANT);
 
 public:
-    Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account);
+    Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent = 0);
     Conversation(QObject* parent = 0);
     virtual ~Conversation();
 

-- 
ktp-common-internals packaging