[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=fe6c5ce

The following commit has been merged in the master branch:
commit fe6c5ce5f0e065315df3e287eec5b5aaef682fc8
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Nov 12 12:31:13 2011 +1100

    Exported ConversationWatcher and ConversationModel to QML.
    Created a basic plasmoid that doesn't do anything.
    
    But everything compiles at least :)
---
 KTp/Declarative/conversation.h              | 4 +++-
 KTp/Declarative/telepathy-text-observer.cpp | 5 +++--
 KTp/Declarative/telepathy-text-observer.h   | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 2287a40..bb7b40c 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -21,13 +21,15 @@
 #ifndef CONVERSATION_H
 #define CONVERSATION_H
 
+#include "kdetelepathychat_export.h"
+
 #include <QObject>
 #include <TelepathyQt4/Account>
 #include <TelepathyQt4/TextChannel>
 #include "conversation-model.h"
 
 class ConversationModel;
-class Conversation : public QObject
+class KDE_TELEPATHY_CHAT_EXPORT Conversation : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(const ConversationModel* model READ model NOTIFY modelChanged)
diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index bbe4d5f..03e1f6e 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -37,7 +37,9 @@ static inline Tp::ChannelClassSpecList channelClassList()
 ConversationWatcher::ConversationWatcher() :
 	AbstractClientObserver(channelClassList())
 {
-
+	kDebug();
+	qFatal("Derp!");
+	*(int*)0=0;
 }
 
 void ConversationWatcher::observeChannels(const Tp::MethodInvocationContextPtr<>& context,
@@ -66,7 +68,6 @@ void ConversationWatcher::observeChannels(const Tp::MethodInvocationContextPtr<>
 
 ConversationWatcher::~ConversationWatcher()
 {
-
 }
 
 #include "moc_conversation-watcher.cpp"
\ No newline at end of file
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 40a7be2..4364a41 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -21,11 +21,12 @@
 #ifndef CONVERSATION_WATCHER_H
 #define CONVERSATION_WATCHER_H
 
+#include "kdetelepathychat_export.h"
 #include <TelepathyQt4/AbstractClient>
 
 class Conversation;
 
-class ConversationWatcher : public QObject, public Tp::AbstractClientObserver 
+class KDE_TELEPATHY_CHAT_EXPORT ConversationWatcher : public QObject, public Tp::AbstractClientObserver 
 {
 Q_OBJECT
 
@@ -39,7 +40,7 @@ public:
 								 const Tp::AbstractClientObserver::ObserverInfo& observerInfo
 								);
     ConversationWatcher();
-    virtual ~ConversationWatcher();
+    ~ConversationWatcher();
 
 Q_SIGNALS:
 	void newConversation(Conversation&);

-- 
ktp-common-internals packaging