[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0c82eb5

The following commit has been merged in the master branch:
commit 0c82eb598f47dbb47a2af496d03c6da0f9895a22
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.
---
 CMakeLists.txt                                             |  3 +++
 .../emoticons/ktptextui_message_filter_emoticons.desktop   | 14 ++++++++++++++
 lib/filters.h                                              | 14 --------------
 lib/message-processor.cpp                                  |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49fc633..a606992 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,3 +42,6 @@ add_subdirectory(data)
 add_subdirectory(adiumxtra-protocol-handler)
 add_subdirectory(logviewer)
 add_subdirectory(plasmoid)
+
+
+add_subdirectory(filters)
\ No newline at end of file
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop b/filters/emoticons/ktptextui_message_filter_emoticons.desktop
new file mode 100644
index 0000000..e5aebeb
--- /dev/null
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=//TODO:.
+Type=Service
+ServiceTypes=KTpTextUi/MessageFilter
+
+X-KDE-Library=ktptextui_filter_emoticons
+X-KDE-PluginInfo-Author=Lasath Fernando
+X-KDE-PluginInfo-Email=kde at lasath.org
+X-KDE-PluginInfo-Name=emoticons
+X-KDE-PluginInfo-Version=0.3
+X-KDE-PluginInfo-Website=http://techbase.kde.org/Projects/Telepathy
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/lib/filters.h b/lib/filters.h
index 2aed5bd..4a4616c 100644
--- a/lib/filters.h
+++ b/lib/filters.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/lib/message-processor.cpp b/lib/message-processor.cpp
index ebef0fa..dfa78d4 100644
--- a/lib/message-processor.cpp
+++ b/lib/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-text-ui packaging