[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=8e80c8f

The following commit has been merged in the master branch:
commit 8e80c8fac8421e9d2c4290a9c34ef387bafc97e4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 1 23:27:53 2012 +0000

    Strip incorrect KTp namespace
    
    Add process outgoing message
---
 KTp/message-filters-private.h |  4 ++--
 KTp/message-processor.cpp     | 18 ++++++++++++++----
 KTp/message-processor.h       |  7 +++++--
 KTp/message.cpp               |  4 +---
 KTp/message.h                 |  3 ---
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index b3976ee..8824e01 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -8,7 +8,7 @@
 
 class UrlFilter : public AbstractMessageFilter
 {
-    virtual void filterMessage(KTp::Message &info) {
+    virtual void filterMessage(Message &info) {
         QString message = info.mainMessagePart();
 
         // link detection
@@ -76,4 +76,4 @@ class UrlFilter : public AbstractMessageFilter
 
         info.setMainMessagePart(message);
     }
-};
\ No newline at end of file
+};
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 6e603f2..1854549 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -46,17 +46,27 @@ MessageProcessor::MessageProcessor()
     m_filters << new UrlFilter();
 }
 
-KTp::Message MessageProcessor::processIncomingMessage(Tp::ReceivedMessage receivedMessage)
+
+MessageProcessor::~MessageProcessor()
+{
+}
+
+Message MessageProcessor::processIncomingMessage(const Tp::ReceivedMessage &receivedMessage)
 {
-    KTp::Message message(receivedMessage);
+    Message message(receivedMessage);
     Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
         filter->filterMessage(message);
     }
     return message;
 }
 
-MessageProcessor::~MessageProcessor()
+Message MessageProcessor::processOutgoingMessage(const Tp::Message &sentMessage)
 {
-
+    Message message(sentMessage);
+    Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
+        filter->filterMessage(message);
+    }
+    return message;
 }
 
+
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index 43413e1..6c6d3b7 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -25,7 +25,7 @@
 
 class AbstractMessageFilter {
 public:
-    virtual void filterMessage(KTp::Message&) = 0;
+    virtual void filterMessage(Message &message) = 0;
     virtual ~AbstractMessageFilter();
 };
 
@@ -39,7 +39,10 @@ public:
     ~MessageProcessor();
 
     //text-ui will call this somewhere in handleIncommingMessage just before displaying it
-    KTp::Message processIncomingMessage(Tp::ReceivedMessage);
+    Message processIncomingMessage(const Tp::ReceivedMessage &message);
+    Message processOutgoingMessage(const Tp::Message &message);
+
+
 
 protected:
     explicit MessageProcessor();
diff --git a/KTp/message.cpp b/KTp/message.cpp
index 0e11dd2..24f94e3 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -23,8 +23,6 @@
 #include <QtGui/QTextDocument> //needed for Qt::escape
 
 
-using namespace KTp;
-
 Message::Message(const Tp::Message &original)
     : m_originalMessage(original)
 {
@@ -65,7 +63,7 @@ QVariant Message::property(const QString &name) const
     return m_properties[name];
 }
 
-void KTp::Message::setProperty(const QString &name, const QVariant &value)
+void Message::setProperty(const QString &name, const QVariant &value)
 {
     m_properties[name]=value;
 }
diff --git a/KTp/message.h b/KTp/message.h
index 1ccdd41..5b4a8f3 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -22,8 +22,6 @@
 
 #include <TelepathyQt/Message>
 
-namespace KTp {
-
 class Message {
 
 public:
@@ -48,6 +46,5 @@ private:
     };
 };
 
-}
 
 #endif // KTP_MESSAGE_H

-- 
ktp-common-internals packaging