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

The following commit has been merged in the master branch:
commit c6e594db71336c78956f3212b581bf1f0d8b4645
Author: Lasath Fernando <kde at lasath.org>
Date:   Thu Feb 2 13:10:27 2012 +1100

    Move emoticon code from replaceMessageKeywords() to EmoticonFilter
---
 KTp/message-filters-private.h | 10 +++++++---
 KTp/message-processor.cpp     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index f54425f..bc955c0 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -1,17 +1,21 @@
 
 #include "message-processor.h"
 
+#include <KEmoticons>
+
 class UrlFilter : public AbstractMessageFilter
 {
-    virtual void filterMessage(Message& message);
+    void filterMessage(Message& message);
 };
 
 class ImageFilter : public AbstractMessageFilter
 {
-    virtual void filterMessage(Message& message);
+    void filterMessage(Message& message);
 };
 
 class EmoticonFilter : public AbstractMessageFilter
 {
-    virtual void filterMessage(Message& message);
+    void filterMessage(Message& message);
+private:
+    KEmoticons m_emoticons;
 };
\ No newline at end of file
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 1854549..e35f97f 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -43,7 +43,7 @@ MessageProcessor* MessageProcessor::instance()
 
 MessageProcessor::MessageProcessor()
 {
-    m_filters << new UrlFilter();
+    m_filters << new UrlFilter() << new EmoticonFilter();
 }
 
 

-- 
ktp-common-internals packaging