[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=02d12ff

The following commit has been merged in the master branch:
commit 02d12ffda52d5b412ca3efb8df80d9de7da33940
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue May 1 12:59:27 2012 +1000

    Git add forgotten files
    
    It turns out I herp-derped massively. Half the previous commits
    didn't have their new files committed.
    
    Now, I'm too lazy to interactively rebase and add everything to
    their appropriate commits, so here they all are.
---
 filters/CMakeLists.txt                             |  2 ++
 filters/emoticons/CMakeLists.txt                   | 27 +++++++++++++++++
 .../emoticons/emoticon-filter.cpp                  | 35 +++++++++++++++-------
 .../emoticon-filter.h}                             | 20 +++++++++----
 lib/KTp/AbstractMessageFilter                      |  6 ++++
 lib/ktptxtui_message_filter.desktop                |  3 ++
 6 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
new file mode 100644
index 0000000..7954be1
--- /dev/null
+++ b/filters/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory (emoticons)
+add_subdirectory(escape)
\ No newline at end of file
diff --git a/filters/emoticons/CMakeLists.txt b/filters/emoticons/CMakeLists.txt
new file mode 100644
index 0000000..6ba9b27
--- /dev/null
+++ b/filters/emoticons/CMakeLists.txt
@@ -0,0 +1,27 @@
+set (ktptextui_message_filter_emoticons_SRCS
+     emoticon-filter.cpp
+)
+
+kde4_add_ui_files (ktptextui_message_filter_emoticons_SRCS
+)
+
+kde4_add_plugin (ktptextui_message_filter_emoticons
+                 ${ktptextui_message_filter_emoticons_SRCS}
+)
+
+target_link_libraries (ktptextui_message_filter_emoticons
+    ktpchat
+    ${QT_LIBRARIES}
+    ${KDE4_KDEUI_LIBS}
+    ${TELEPATHY_QT4_LIBRARIES}
+    ${KDE4_KEMOTICONS_LIBS}
+)
+
+# Install:
+install (TARGETS ktptextui_message_filter_emoticons
+         DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES ktptextui_message_filter_emoticons.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/lib/abstract-message-filter.h b/filters/emoticons/emoticon-filter.cpp
similarity index 55%
copy from lib/abstract-message-filter.h
copy to filters/emoticons/emoticon-filter.cpp
index 7b60d48..e656e47 100644
--- a/lib/abstract-message-filter.h
+++ b/filters/emoticons/emoticon-filter.cpp
@@ -16,21 +16,34 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef ABSTRACTPLUGIN_H
-#define ABSTRACTPLUGIN_H
+#include "emoticon-filter.h"
 
-#include "message.h"
-#include "ktpchat_export.h"
+#include <KPluginFactory>
+#include <KEmoticons>
 
-class KDE_TELEPATHY_CHAT_EXPORT AbstractMessageFilter : public QObject
+class EmoticonFilter::Private
 {
-Q_OBJECT
 public:
-    AbstractMessageFilter(QObject* parent = 0);
-    virtual ~AbstractMessageFilter();
-
-    virtual void filterMessage(Message &message) = 0;
+    KEmoticons emoticons;
 };
 
-#endif // ABSTRACTPLUGIN_H
+EmoticonFilter::EmoticonFilter(QObject *parent, const QVariantList &)
+    : AbstractMessageFilter(parent),
+      d(new Private)
+{
+}
+
+void EmoticonFilter::filterMessage(Message& message)
+{
+    message.setMainMessagePart(d->emoticons.theme().parseEmoticons(message.mainMessagePart()));
+}
+
+EmoticonFilter::~EmoticonFilter()
+{
+    delete d;
+}
+
+K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<EmoticonFilter>();)
+K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_emoticons"))
 
+#include "moc_emoticon-filter.cpp"
\ No newline at end of file
diff --git a/filters/escape/escape-filter.h b/filters/emoticons/emoticon-filter.h
similarity index 74%
copy from filters/escape/escape-filter.h
copy to filters/emoticons/emoticon-filter.h
index 282be8a..55158c7 100644
--- a/filters/escape/escape-filter.h
+++ b/filters/emoticons/emoticon-filter.h
@@ -16,13 +16,23 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include <QObject>
+#ifndef EMOTICON_FILTER_H
+#define EMOTICON_FILTER_H
 
 #include <KTp/AbstractMessageFilter>
 
-class EscapeFilter : public AbstractMessageFilter
+class EmoticonFilter : public AbstractMessageFilter
 {
+Q_OBJECT
+
 public:
-    explicit EscapeFilter(QObject* parent, const QVariantList&);
-    virtual void filterMessage(Message& message);
-};
\ No newline at end of file
+    EmoticonFilter(QObject* parent, const QVariantList &);
+    virtual ~EmoticonFilter();
+
+    void filterMessage(Message& message);
+private:
+    class Private;
+    Private *d;
+};
+
+#endif
\ No newline at end of file
diff --git a/lib/KTp/AbstractMessageFilter b/lib/KTp/AbstractMessageFilter
new file mode 100644
index 0000000..741455a
--- /dev/null
+++ b/lib/KTp/AbstractMessageFilter
@@ -0,0 +1,6 @@
+#ifndef KTP_TEXT_UI_ABSTRACT_MESSAGE_FILTER
+#define KTP_TEXT_UI_ABSTRACT_MESSAGE_FILTER
+
+#include "abstract-message-filter.h"
+
+#endif
\ No newline at end of file
diff --git a/lib/ktptxtui_message_filter.desktop b/lib/ktptxtui_message_filter.desktop
new file mode 100644
index 0000000..fc94525
--- /dev/null
+++ b/lib/ktptxtui_message_filter.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=KTpTextUi/MessageFilter
\ No newline at end of file

-- 
ktp-text-ui packaging