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

The following commit has been merged in the master branch:
commit b8f883c242d263839449521c47d047b74e22ed5d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Feb 2 17:09:53 2013 +0000

    Update all message filters to take message context
---
 KTp/CMakeLists.txt               | 1 +
 KTp/message-backslash-filter.cpp | 3 ++-
 KTp/message-escape-filter.cpp    | 3 ++-
 KTp/message-filters-private.h    | 6 +++---
 KTp/message-url-filter.cpp       | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index ed2ab3e..16bfa6c 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -16,6 +16,7 @@ set (ktp_common_internals_private_SRCS
      logs-importer.cpp
      logs-importer-private.cpp
      message.cpp
+     message-context.cpp
      message-backslash-filter.cpp
      message-escape-filter.cpp
      message-filter-config-manager.cpp
diff --git a/KTp/message-backslash-filter.cpp b/KTp/message-backslash-filter.cpp
index c91522e..6a972a9 100644
--- a/KTp/message-backslash-filter.cpp
+++ b/KTp/message-backslash-filter.cpp
@@ -24,7 +24,8 @@ MessageBackslashFilter::MessageBackslashFilter(QObject *parent)
 {
 }
 
-void MessageBackslashFilter::filterMessage(KTp::Message& message)
+void MessageBackslashFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
 {
+    Q_UNUSED(context)
     message.setMainMessagePart(message.mainMessagePart().replace(QLatin1Char('\'), QLatin1String("\\"))); //replace a single backslash with two backslashes.
 }
diff --git a/KTp/message-escape-filter.cpp b/KTp/message-escape-filter.cpp
index 696389b..310e465 100644
--- a/KTp/message-escape-filter.cpp
+++ b/KTp/message-escape-filter.cpp
@@ -25,8 +25,9 @@ MessageEscapeFilter::MessageEscapeFilter(QObject *parent)
 {
 }
 
-void MessageEscapeFilter::filterMessage(KTp::Message& message)
+void MessageEscapeFilter::filterMessage(KTp::Message &message, const KTp::MessageContext &context)
 {
+    Q_UNUSED(context)
     QString escapedMessage = Qt::escape(message.mainMessagePart());
 
     escapedMessage.replace(QLatin1String("
 "), QLatin1String("<br/> ")); //keep leading whitespaces
diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index 02e2230..b9d4971 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -27,21 +27,21 @@ class MessageUrlFilter : public KTp::AbstractMessageFilter
 {
   public:
     explicit MessageUrlFilter(QObject *parent = 0);
-    void filterMessage(KTp::Message &message);
+    void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
 };
 
 class MessageEscapeFilter : public KTp::AbstractMessageFilter
 {
   public:
     explicit MessageEscapeFilter(QObject *parent = 0);
-    virtual void filterMessage(KTp::Message& message);
+    virtual void filterMessage(KTp::Message& message, const KTp::MessageContext &context);
 };
 
 class MessageBackslashFilter : public KTp::AbstractMessageFilter
 {
 public:
     explicit MessageBackslashFilter(QObject *parent = 0);
-    virtual void filterMessage(KTp::Message& message);
+    virtual void filterMessage(KTp::Message& message, const KTp::MessageContext &context);
 };
 
 #endif
diff --git a/KTp/message-url-filter.cpp b/KTp/message-url-filter.cpp
index 24b6522..6e4f64a 100644
--- a/KTp/message-url-filter.cpp
+++ b/KTp/message-url-filter.cpp
@@ -32,8 +32,9 @@ MessageUrlFilter::MessageUrlFilter(QObject *parent)
 {
 }
 
-void MessageUrlFilter::filterMessage(KTp::Message &info)
+void MessageUrlFilter::filterMessage(KTp::Message &info, const KTp::MessageContext &context)
 {
+    Q_UNUSED(context);
     QString message = info.mainMessagePart();
     //FIXME: make "Urls" into a constant
     QVariantList urls = info.property("Urls").toList();

-- 
ktp-common-internals packaging