[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=4a24748

The following commit has been merged in the master branch:
commit 4a247488a71e35237df0c9d7813930b8bbbf02ec
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Apr 17 20:17:23 2012 +1000

    Move EmoticonFilter into it's own plugin
    
    The first plugin was created, all it's kinks worked out (was a pain
    in the ass) and EmoticonFilter was moved into it. It now compiles,
    but there is no way of testing the loader hasn't been written yet.
---
 KTp/message-filters-private.h | 14 --------------
 KTp/message-processor.cpp     |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index 2aed5bd..4a4616c 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -23,8 +23,6 @@
 
 #include <QObject>
 
-#include <KEmoticons>
-
 class UrlFilter : public AbstractMessageFilter
 {
 public:
@@ -32,18 +30,6 @@ public:
     void filterMessage(Message &message);
 };
 
-class EmoticonFilter : public AbstractMessageFilter
-{
-public:
-    explicit EmoticonFilter(QObject *parent = 0);
-    virtual ~EmoticonFilter();
-
-    void filterMessage(Message &message);
-private:
-    class Private;
-    Private *d;
-};
-
 class EscapeFilter : public AbstractMessageFilter
 {
 public:
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index ebef0fa..dfa78d4 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -39,7 +39,7 @@ MessageProcessor* MessageProcessor::instance()
 
 MessageProcessor::MessageProcessor()
 {
-    m_filters << new EscapeFilter(this) << new UrlFilter(this) << new EmoticonFilter(this);
+    m_filters << new EscapeFilter(this) << new UrlFilter(this);
 }
 
 

-- 
ktp-common-internals packaging