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

The following commit has been merged in the master branch:
commit ff42584ff6b649ab4620357e66c4bb30d862f801
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Jan 27 08:39:06 2012 +1100

    Implement skeleton of MessageProcessor
---
 KTp/{message.cpp => message-processor.cpp} | 32 +++++++-------------
 KTp/{message.cpp => message-processor.h}   | 47 +++++++++++++-----------------
 KTp/message.cpp                            |  4 +--
 KTp/message.h                              | 11 +++----
 4 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message-processor.cpp
similarity index 59%
copy from KTp/message.cpp
copy to KTp/message-processor.cpp
index faaa7b6..e6a140c 100644
--- a/KTp/message.cpp
+++ b/KTp/message-processor.cpp
@@ -17,37 +17,25 @@
 */
 
 
-#include "message.h"
+#include "message-processor.h"
 
-using namespace KTp;
+QList<AbstractMessageFilter*> MessageProcessor::m_filters;
 
-Message::Message(Tp::Message &original)
-    : originalMessage(original),
-      content(originalMessage.text())
+MessageProcessor::MessageProcessor()
 {
 }
 
-QString Message::mainMessagePart() const
+KTp::Message MessageProcessor::processIncommingMessage(Tp::ReceivedMessage receivedMessage)
 {
-    return content.operator[](Message::MainMessage);
+    KTp::Message message(receivedMessage);
+    Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
+        filter->filterMessage(message);
+    }
+    return message;
 }
 
-void Message::setMainMessagePart(const QString& message)
+MessageProcessor::~MessageProcessor()
 {
-    content[Message::MainMessage] = message;
-}
-
-void Message::appendMessagePart(const QString& part)
-{
-    content << part;
-}
 
-QString Message::finalizedMessage() const
-{
-    content.join(QLatin1Literal("
"));
 }
 
-QVariantMap& Message::miscData()
-{
-    return miscData;
-}
\ No newline at end of file
diff --git a/KTp/message.cpp b/KTp/message-processor.h
similarity index 58%
copy from KTp/message.cpp
copy to KTp/message-processor.h
index faaa7b6..c2bcfb0 100644
--- a/KTp/message.cpp
+++ b/KTp/message-processor.h
@@ -17,37 +17,30 @@
 */
 
 
-#include "message.h"
-
-using namespace KTp;
+#ifndef MESSAGE_PROCESSOR_H
+#define MESSAGE_PROCESSOR_H
 
-Message::Message(Tp::Message &original)
-    : originalMessage(original),
-      content(originalMessage.text())
-{
-}
+#include "message.h"
+#include <QList>
 
-QString Message::mainMessagePart() const
-{
-    return content.operator[](Message::MainMessage);
-}
+class AbstractMessageFilter {
+public:
+    virtual void filterMessage(KTp::Message) = 0;
+    virtual ~AbstractMessageFilter();
+};
 
-void Message::setMainMessagePart(const QString& message)
+//each thing that displays message will have an instance of this
+class MessageProcessor
 {
-    content[Message::MainMessage] = message;
-}
 
-void Message::appendMessagePart(const QString& part)
-{
-    content << part;
-}
+public:
+    MessageProcessor();
+    ~MessageProcessor();
 
-QString Message::finalizedMessage() const
-{
-    content.join(QLatin1Literal("
"));
-}
+    //text-ui will call this somewhere in handleIncommingMessage just before displaying it
+    KTp::Message processIncommingMessage(Tp::ReceivedMessage);
+private:
+    static QList<AbstractMessageFilter*> m_filters;
+};
 
-QVariantMap& Message::miscData()
-{
-    return miscData;
-}
\ No newline at end of file
+#endif // MESSAGE_PROCESSOR_H
diff --git a/KTp/message.cpp b/KTp/message.cpp
index faaa7b6..9fff9c0 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -44,10 +44,10 @@ void Message::appendMessagePart(const QString& part)
 
 QString Message::finalizedMessage() const
 {
-    content.join(QLatin1Literal("
"));
+    return content.join(QLatin1String("
"));
 }
 
 QVariantMap& Message::miscData()
 {
-    return miscData;
+    return m_miscData;
 }
\ No newline at end of file
diff --git a/KTp/message.h b/KTp/message.h
index dfeb643..c4a1aae 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -1,6 +1,5 @@
 /*
-    <one line to give the library's name and an idea of what it does.>
-    Copyright (C) 2012  Lasath Fernando <email>
+    Copyright (C) 2012  Lasath Fernando <kde at lasath.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -26,18 +25,20 @@
 namespace KTp {
 
 class Message {
+
+public:
     Message(Tp::Message& original);
 
     QString mainMessagePart() const;
-    void setMainMessagePart(const QString&);
-    void appendMessagePart(const QString&);
+    void setMainMessagePart(const QString& message);
+    void appendMessagePart(const QString& part);
 
     QString finalizedMessage() const;
 
     QVariantMap& miscData();
 private:
     Tp::Message originalMessage;
-    QVariantMap miscData;
+    QVariantMap m_miscData;
     QStringList content;
 
     enum MessageParts {

-- 
ktp-common-internals packaging