[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:05:30 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=98bb38d
The following commit has been merged in the master branch:
commit 98bb38d33d86b41f44530f50caa5a9b1a171c8db
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
---
KTp/abstract-message-filter.cpp | 14 ++++++++++++++
KTp/abstract-message-filter.h | 11 ++++++++++-
KTp/message-processor.cpp | 4 ++--
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/KTp/abstract-message-filter.cpp b/KTp/abstract-message-filter.cpp
index 1f733e6..0cb0dc7 100644
--- a/KTp/abstract-message-filter.cpp
+++ b/KTp/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/KTp/abstract-message-filter.h b/KTp/abstract-message-filter.h
index 7b60d48..9e895c5 100644
--- a/KTp/abstract-message-filter.h
+++ b/KTp/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/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 9262d69..28ed002 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/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-common-internals packaging
More information about the pkg-kde-commits
mailing list