[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=18e821e

The following commit has been merged in the master branch:
commit 18e821e679291f1a0a4155e82324247807c41e57
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jun 16 12:17:42 2012 +1000

    Create skeleton for ImagesFilter
    
    Should probably save something like this somewhere so I don't make
    silly mistakes doing this in futre.
---
 filters/CMakeLists.txt                             |  3 ++-
 filters/images/CMakeLists.txt                      | 28 +++++++++++++++++++++
 .../format-filter.h => images/images-filter.cpp}   | 29 +++++++++++-----------
 .../format-filter.h => images/images-filter.h}     | 10 ++------
 .../ktptextui_message_filter_images.desktop}       |  4 +--
 5 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index 283405b..3b6387f 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory (emoticons)
 add_subdirectory(escape)
-add_subdirectory(formatting)
\ No newline at end of file
+add_subdirectory(formatting)
+add_subdirectory(images)
diff --git a/filters/images/CMakeLists.txt b/filters/images/CMakeLists.txt
new file mode 100644
index 0000000..f09c1f4
--- /dev/null
+++ b/filters/images/CMakeLists.txt
@@ -0,0 +1,28 @@
+set (ktptextui_message_filter_images_SRCS
+     images-filter.cpp
+)
+
+kde4_add_ui_files (ktptextui_message_filter_images_SRCS
+)
+
+kde4_add_plugin (ktptextui_message_filter_images
+                 ${ktptextui_message_filter_images_SRCS}
+)
+
+target_link_libraries (ktptextui_message_filter_images
+    ktpchat
+    ${QT_LIBRARIES}
+    ${KDE4_KDEUI_LIBS}
+    ${TELEPATHY_QT4_LIBRARIES}
+    ${KDE4_KEMOTICONS_LIBS}
+)
+
+# Install:
+install (TARGETS ktptextui_message_filter_images
+         DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES ktptextui_message_filter_images.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
diff --git a/filters/formatting/format-filter.h b/filters/images/images-filter.cpp
similarity index 68%
copy from filters/formatting/format-filter.h
copy to filters/images/images-filter.cpp
index f3d8387..83765fe 100644
--- a/filters/formatting/format-filter.h
+++ b/filters/images/images-filter.cpp
@@ -16,23 +16,22 @@
  *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifndef FORMAT_FILTER_H
-#define FORMAT_FILTER_H
-#include <KTp/AbstractMessageFilter>
+#include "images-filter.h"
 
-class FormatFilter : public AbstractMessageFilter
-{
-Q_OBJECT
+#include <QRegExp>
+
+#include <KPluginFactory>
+#include <KDebug>
 
-public:
-    FormatFilter (QObject* parent, const QVariantList &);
-    virtual void filterMessage (Message& message);
+ImagesFilter::ImagesFilter (QObject* parent, const QVariantList&) :
+    AbstractMessageFilter (parent)
+{
+}
 
-private:
-    void addTag (const char *markingCharacter, char htmlTag);
+void ImagesFilter::filterMessage (Message& message)
+{
 
-    class Private;
-    Private *d;
-};
+}
 
-#endif // FORMAT_FILTER_H
+K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<ImagesFilter>();)
+K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_images"))
\ No newline at end of file
diff --git a/filters/formatting/format-filter.h b/filters/images/images-filter.h
similarity index 82%
copy from filters/formatting/format-filter.h
copy to filters/images/images-filter.h
index f3d8387..26bb9b3 100644
--- a/filters/formatting/format-filter.h
+++ b/filters/images/images-filter.h
@@ -20,19 +20,13 @@
 #define FORMAT_FILTER_H
 #include <KTp/AbstractMessageFilter>
 
-class FormatFilter : public AbstractMessageFilter
+class ImagesFilter : public AbstractMessageFilter
 {
 Q_OBJECT
 
 public:
-    FormatFilter (QObject* parent, const QVariantList &);
+    ImagesFilter (QObject* parent, const QVariantList &);
     virtual void filterMessage (Message& message);
-
-private:
-    void addTag (const char *markingCharacter, char htmlTag);
-
-    class Private;
-    Private *d;
 };
 
 #endif // FORMAT_FILTER_H
diff --git a/filters/escape/ktptextui_message_filter_escape.desktop b/filters/images/ktptextui_message_filter_images.desktop
similarity index 82%
copy from filters/escape/ktptextui_message_filter_escape.desktop
copy to filters/images/ktptextui_message_filter_images.desktop
index c6d4936..fa06bcc 100644
--- a/filters/escape/ktptextui_message_filter_escape.desktop
+++ b/filters/images/ktptextui_message_filter_images.desktop
@@ -4,10 +4,10 @@ Comment=//TODO:.
 Type=Service
 ServiceTypes=KTpTextUi/MessageFilter
 
-X-KDE-Library=ktptextui_message_filter_escape
+X-KDE-Library=ktptextui_message_filter_images
 X-KDE-PluginInfo-Author=Lasath Fernando
 X-KDE-PluginInfo-Email=kde at lasath.org
-X-KDE-PluginInfo-Name=escape
+X-KDE-PluginInfo-Name=images
 X-KDE-PluginInfo-Version=0.4
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
 X-KDE-PluginInfo-License=GPL

-- 
ktp-text-ui packaging