[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=48b0846

The following commit has been merged in the master branch:
commit 48b0846cedf79e7d638f953a74b09ffabe63e28d
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 18:13:05 2012 +1100

    Changed target property back to type ConversationTarget*. It turns out all I had to do was call qmlRegisterType() with no arguments.
---
 lib/conversation.cpp        | 2 +-
 lib/conversation.h          | 8 ++++----
 lib/conversations-model.cpp | 3 ++-
 lib/conversations-model.h   | 2 +-
 lib/qml-plugins.cpp         | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/conversation.cpp b/lib/conversation.cpp
index 4ca65b4..a5eefd1 100644
--- a/lib/conversation.cpp
+++ b/lib/conversation.cpp
@@ -32,7 +32,7 @@ public:
 //     Tp::AccountPtr account;
 };
 
-Conversation::Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent) :
+Conversation::Conversation(const Tp::TextChannelPtr& channel, const Tp::AccountPtr& account, QObject* parent) :
         QObject(parent),
         d (new ConversationPrivate)
 {
diff --git a/lib/conversation.h b/lib/conversation.h
index 94f3f01..5c99329 100644
--- a/lib/conversation.h
+++ b/lib/conversation.h
@@ -28,21 +28,21 @@
 // #include "conversation-model.h"
 #include <KIcon>
 #include "conversation-que-manager.h"
-#include "conversation-target.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(QObject* target READ target CONSTANT);
+Q_PROPERTY(ConversationTarget* target READ target CONSTANT);
 //TODO: rename this to messages
 Q_PROPERTY(MessagesModel* model READ model CONSTANT);
 
 public:
-    Conversation(Tp::TextChannelPtr channel, Tp::AccountPtr account, QObject* parent = 0);
+    Conversation(const Tp::TextChannelPtr &channel, const Tp::AccountPtr &account, QObject* parent = 0);
     Conversation(QObject* parent = 0);
     virtual ~Conversation();
 
diff --git a/lib/conversations-model.cpp b/lib/conversations-model.cpp
index 55d21b2..6de4ff8 100644
--- a/lib/conversations-model.cpp
+++ b/lib/conversations-model.cpp
@@ -47,7 +47,8 @@ int ConversationsModel::rowCount(const QModelIndex& parent) const
     return d->conversations.count();
 }
 
-ConversationsModel::ConversationsModel() :
+ConversationsModel::ConversationsModel(QObject* parent) :
+        QAbstractListModel(parent),
         d(new ConversationsModelPrivate)
 {
     QHash<int, QByteArray> roles;
diff --git a/lib/conversations-model.h b/lib/conversations-model.h
index 4af433c..d5c32d4 100644
--- a/lib/conversations-model.h
+++ b/lib/conversations-model.h
@@ -31,7 +31,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationsModel : public QAbstractListModel
 {
 Q_OBJECT
 public:
-    ConversationsModel();
+    explicit ConversationsModel(QObject* parent = 0);
     virtual ~ConversationsModel();
 
     virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
diff --git a/lib/qml-plugins.cpp b/lib/qml-plugins.cpp
index 5c3efb0..fa5fe56 100644
--- a/lib/qml-plugins.cpp
+++ b/lib/qml-plugins.cpp
@@ -30,6 +30,7 @@ void QmlPlugins::registerTypes ( const char* uri )
 {
     qmlRegisterType<TelepathyTextObserver> ( uri, 0, 1, "TelepathyTextObserver" );
     qmlRegisterType<Conversation>(uri, 0, 1, "Conversation");
+    qmlRegisterType<ConversationTarget>();
     qmlRegisterType<MessagesModel> ( uri, 0, 1, "MessagesModel" );
     qmlRegisterType<ConversationsModel>(uri, 0, 1, "ConversationsModel");
 }

-- 
ktp-text-ui packaging