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

The following commit has been merged in the master branch:
commit e60818ff5d5ec7f4f316fd94e6adc5777444a1e9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 11 23:43:01 2012 +0100

    Allow for different message filtering on incoming and outgoing messages
    
    REVIEW: 106429
---
 lib/abstract-message-filter.cpp | 14 ++++++++++++++
 lib/abstract-message-filter.h   | 11 ++++++++++-
 lib/message-processor.cpp       |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/abstract-message-filter.cpp b/lib/abstract-message-filter.cpp
index 1f733e6..0cb0dc7 100644
--- a/lib/abstract-message-filter.cpp
+++ b/lib/abstract-message-filter.cpp
@@ -26,3 +26,17 @@ AbstractMessageFilter::AbstractMessageFilter(QObject* parent)
 AbstractMessageFilter::~AbstractMessageFilter()
 {
 }
+
+void AbstractMessageFilter::filterIncomingMessage(Message &message)
+{
+    filterMessage(message);
+}
+
+void AbstractMessageFilter::filterOutgoingMessage(Message &message)
+{
+    filterMessage(message);
+}
+
+void AbstractMessageFilter::filterMessage(Message &message)
+{
+}
diff --git a/lib/abstract-message-filter.h b/lib/abstract-message-filter.h
index 7b60d48..9e895c5 100644
--- a/lib/abstract-message-filter.h
+++ b/lib/abstract-message-filter.h
@@ -29,7 +29,16 @@ public:
     AbstractMessageFilter(QObject* parent = 0);
     virtual ~AbstractMessageFilter();
 
-    virtual void filterMessage(Message &message) = 0;
+    /** Filter messages to show on the UI recieved by another contact*/
+    virtual void filterIncomingMessage(Message &message);
+
+    /** Filter messages to show in the UI that you have sent
+        This does _not_ affect the actual message sent, only the visual representation on your screen.
+    */
+    virtual void filterOutgoingMessage(Message &message);
+
+    /** Filter messages in either direction. Base implementation calls this for messages sent/recived in either direction.*/
+    virtual void filterMessage(Message &message);
 };
 
 #endif // ABSTRACTPLUGIN_H
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 9262d69..28ed002 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -62,7 +62,7 @@ Message MessageProcessor::processIncomingMessage(Message receivedMessage)
 {
     Q_FOREACH (AbstractMessageFilter *filter, MessageProcessor::m_filters) {
         kDebug() << "running filter :" << filter->metaObject()->className();
-        filter->filterMessage(receivedMessage);
+        filter->filterIncomingMessage(receivedMessage);
     }
     return receivedMessage;
 }
@@ -70,7 +70,7 @@ Message MessageProcessor::processIncomingMessage(Message receivedMessage)
 Message MessageProcessor::processOutgoingMessage(Message sentMessage)
 {
     Q_FOREACH  (AbstractMessageFilter *filter, MessageProcessor::m_filters) {
-        filter->filterMessage(sentMessage);
+        filter->filterOutgoingMessage(sentMessage);
     }
     return sentMessage;
 }

-- 
ktp-text-ui packaging