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

The following commit has been merged in the master branch:
commit bbad41288a41f3729792276b3294fffb902f4555
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Feb 7 08:52:55 2012 +1100

    Remove ImageFilter. (REVIEW: 103848)
---
 KTp/message-filters-private.h | 7 -------
 KTp/message-processor.cpp     | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index 8e49ea2..6059ea2 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -29,13 +29,6 @@ public:
     void filterMessage(Message& message);
 };
 
-class ImageFilter : public AbstractMessageFilter
-{
-public:
-    explicit ImageFilter(QObject* parent = 0);
-    void filterMessage(Message& message);
-};
-
 class EmoticonFilter : public AbstractMessageFilter
 {
 public:
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 39eb1ff..83d3991 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -48,7 +48,7 @@ MessageProcessor* MessageProcessor::instance()
 
 MessageProcessor::MessageProcessor()
 {
-    m_filters << new UrlFilter(this) << new EmoticonFilter(this) << new ImageFilter(this) << new EscapeFilter(this);
+    m_filters << new EscapeFilter(this) << new EmoticonFilter(this) << new UrlFilter(this);
 }
 
 

-- 
ktp-common-internals packaging