[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=9eeffbf

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

    Removed ConversationTarget from registerTypes().
---
 lib/conversation-target.cpp | 1 -
 lib/conversation-target.h   | 3 ++-
 lib/qml-plugins.cpp         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/conversation-target.cpp b/lib/conversation-target.cpp
index 9997dc8..6befd38 100644
--- a/lib/conversation-target.cpp
+++ b/lib/conversation-target.cpp
@@ -145,4 +145,3 @@ ConversationTarget::~ConversationTarget()
 {
     delete d;
 }
-
diff --git a/lib/conversation-target.h b/lib/conversation-target.h
index 139c007..864296d 100644
--- a/lib/conversation-target.h
+++ b/lib/conversation-target.h
@@ -73,5 +73,6 @@ private:
     ConversationTargetPrivate *d;
 };
 
+Q_DECLARE_METATYPE(ConversationTarget*)
+
 #endif // CONVERSATION_TARGET_H
-// kate: indent-mode cstyle; space-indent on; indent-width 4; replace-tabs on; 
diff --git a/lib/qml-plugins.cpp b/lib/qml-plugins.cpp
index ee034fa..5c3efb0 100644
--- a/lib/qml-plugins.cpp
+++ b/lib/qml-plugins.cpp
@@ -29,7 +29,6 @@
 void QmlPlugins::registerTypes ( const char* uri )
 {
     qmlRegisterType<TelepathyTextObserver> ( uri, 0, 1, "TelepathyTextObserver" );
-    qmlRegisterType<ConversationTarget>(uri, 0, 1, "ConversationTarget");
     qmlRegisterType<Conversation>(uri, 0, 1, "Conversation");
     qmlRegisterType<MessagesModel> ( uri, 0, 1, "MessagesModel" );
     qmlRegisterType<ConversationsModel>(uri, 0, 1, "ConversationsModel");

-- 
ktp-text-ui packaging