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

The following commit has been merged in the master branch:
commit a87fd7b9b5f589aa203a82b5452acf6b14036d90
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 :)
---
 CMakeLists.txt               |  1 +
 lib/CMakeLists.txt           | 29 +++++++++++++++++++++++++++++
 lib/conversation-watcher.cpp |  5 +++--
 lib/conversation-watcher.h   |  5 +++--
 lib/conversation.h           |  4 +++-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b280605..0008e57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,3 +40,4 @@ add_subdirectory(config)
 add_subdirectory(data)
 add_subdirectory(adiumxtra-protocol-handler)
 add_subdirectory(logviewer)
+add_subdirectory(plasmoid)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4fdfdce..c723f81 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -83,3 +83,32 @@ install(FILES
         ktpchat_export.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/KTp COMPONENT Devel
 )
+
+
+project(declarativeplugins)
+
+set(declarativeplugins_SRCS
+    qml-plugins.cpp
+    )
+
+INCLUDE_DIRECTORIES(
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}
+        ${KDE4_INCLUDES}
+)
+
+qt4_automoc(${declarativeplugins_SRCS})
+
+
+add_library(declarativeplugins SHARED ${declarativeplugins_SRCS})
+
+target_link_libraries(declarativeplugins
+	${KDE4_KDECORE_LIBS}
+	${QT_QTSCRIPT_LIBRARY}
+	${QT_QTDECLARATIVE_LIBRARY}
+	${TELEPATHY_QT4_LIBRARIES}
+	ktelepathy_chat_lib
+)
+
+install(TARGETS declarativeplugins DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy/declarativeplugins)
+install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy/declarativeplugins)
diff --git a/lib/conversation-watcher.cpp b/lib/conversation-watcher.cpp
index bbe4d5f..03e1f6e 100644
--- a/lib/conversation-watcher.cpp
+++ b/lib/conversation-watcher.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/lib/conversation-watcher.h b/lib/conversation-watcher.h
index 40a7be2..4364a41 100644
--- a/lib/conversation-watcher.h
+++ b/lib/conversation-watcher.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&);
diff --git a/lib/conversation.h b/lib/conversation.h
index 2287a40..bb7b40c 100644
--- a/lib/conversation.h
+++ b/lib/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)

-- 
ktp-text-ui packaging