[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=1313a32

The following commit has been merged in the master branch:
commit 1313a32b581fe6c6ceb1abe22acfdb20960be873
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 31 10:04:53 2012 +1100

    Fix issues in Message and MessageProcessor. Move replaceMessageKeywords() into a filter.
---
 KTp/message-processor.cpp | 10 +++++++++-
 KTp/message-processor.h   |  6 +++---
 KTp/message.cpp           |  5 ++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index e6a140c..3bb0353 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -18,11 +18,19 @@
 
 
 #include "message-processor.h"
+#include "filters.h"
 
 QList<AbstractMessageFilter*> MessageProcessor::m_filters;
 
-MessageProcessor::MessageProcessor()
+AbstractMessageFilter::~AbstractMessageFilter()
 {
+
+}
+
+
+MessageProcessor::MessageProcessor(QObject* parent): QObject(parent)
+{
+    m_filters << new UrlFilter();
 }
 
 KTp::Message MessageProcessor::processIncommingMessage(Tp::ReceivedMessage receivedMessage)
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index c2bcfb0..50cacec 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -25,16 +25,16 @@
 
 class AbstractMessageFilter {
 public:
-    virtual void filterMessage(KTp::Message) = 0;
+    virtual void filterMessage(KTp::Message&) = 0;
     virtual ~AbstractMessageFilter();
 };
 
 //each thing that displays message will have an instance of this
-class MessageProcessor
+class MessageProcessor : public QObject
 {
 
 public:
-    MessageProcessor();
+    explicit MessageProcessor(QObject* parent = 0);
     ~MessageProcessor();
 
     //text-ui will call this somewhere in handleIncommingMessage just before displaying it
diff --git a/KTp/message.cpp b/KTp/message.cpp
index 9fff9c0..a227cba 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -18,6 +18,7 @@
 
 
 #include "message.h"
+#include <KDebug>
 
 using namespace KTp;
 
@@ -44,7 +45,9 @@ void Message::appendMessagePart(const QString& part)
 
 QString Message::finalizedMessage() const
 {
-    return content.join(QLatin1String("
"));
+    QString msg = content.join(QLatin1String("
"));
+    kDebug() << msg;
+    return msg;
 }
 
 QVariantMap& Message::miscData()

-- 
ktp-common-internals packaging