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

The following commit has been merged in the master branch:
commit 4d6ee73c192a0e734dea2842bf51f06ead465529
Author: Lasath Fernando <kde at lasath.org>
Date:   Wed Jun 27 13:17:49 2012 +1000

    Create skeleton for SearchexpansionFilter
    
    s/images/searchexpansion/g;
---
 filters/CMakeLists.txt                             |  1 +
 filters/searchexpansion/CMakeLists.txt             | 28 ++++++++++++++
 ...tptextui_message_filter_searchexpansion.desktop | 14 +++++++
 .../searchexpansion/searchexpansion-filter.cpp     | 43 +++++++++++-----------
 .../searchexpansion-filter.h}                      | 11 +++---
 5 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index 4560704..ca5ec1e 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory (emoticons)
 add_subdirectory(formatting)
 add_subdirectory(images)
+add_subdirectory(searchexpansion)
diff --git a/filters/searchexpansion/CMakeLists.txt b/filters/searchexpansion/CMakeLists.txt
new file mode 100644
index 0000000..f3dcbc6
--- /dev/null
+++ b/filters/searchexpansion/CMakeLists.txt
@@ -0,0 +1,28 @@
+set (ktptextui_message_filter_searchexpansion_SRCS
+     searchexpansion-filter.cpp
+)
+
+kde4_add_ui_files (ktptextui_message_filter_searchexpansion_SRCS
+)
+
+kde4_add_plugin (ktptextui_message_filter_searchexpansion
+                 ${ktptextui_message_filter_searchexpansion_SRCS}
+)
+
+target_link_libraries (ktptextui_message_filter_searchexpansion
+    ktpchat
+    ${QT_LIBRARIES}
+    ${KDE4_KDEUI_LIBS}
+    ${TELEPATHY_QT4_LIBRARIES}
+    ${KDE4_KEMOTICONS_LIBS}
+)
+
+# Install:
+install (TARGETS ktptextui_message_filter_searchexpansion
+         DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES ktptextui_message_filter_searchexpansion.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
diff --git a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
new file mode 100644
index 0000000..a6e17bd
--- /dev/null
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=//TODO:.
+Type=Service
+ServiceTypes=KTpTextUi/MessageFilter
+
+X-KDE-Library=ktptextui_message_filter_searchexpansion
+X-KDE-PluginInfo-Author=Lasath Fernando
+X-KDE-PluginInfo-Email=kde at lasath.org
+X-KDE-PluginInfo-Name=searchexpansion
+X-KDE-PluginInfo-Version=0.4
+X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/lib/plugin-config-manager.h b/filters/searchexpansion/searchexpansion-filter.cpp
similarity index 58%
copy from lib/plugin-config-manager.h
copy to filters/searchexpansion/searchexpansion-filter.cpp
index 4307b55..b44c8fe 100644
--- a/lib/plugin-config-manager.h
+++ b/filters/searchexpansion/searchexpansion-filter.cpp
@@ -16,31 +16,30 @@
  *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifndef PLUGIN_CONFIG_MANAGER_H
-#define PLUGIN_CONFIG_MANAGER_H
+#include "searchexpansion-filter.h"
 
-#include <KPluginInfo>
-#include <ktpchat_export.h>
+#include <QStringBuilder>
+#include <QRegExp>
+#include <QImageReader>
 
-class KDE_TELEPATHY_CHAT_EXPORT PluginConfigManager
-{
-public:
-    static PluginConfigManager* self();
-
-    KPluginInfo::List allPlugins() const;
-    KPluginInfo::List enabledPlugins() const;
+#include <KPluginFactory>
+#include <KDebug>
+#include <KUrl>
+#include <KLocalizedString>
 
-    KConfigGroup       configGroup() const;
-    KSharedConfig::Ptr sharedConfig() const;
-
-protected:
-    PluginConfigManager();
+class SearchexpansionFilter::Private {
+public:
+    QRegExp imageRegex;
+};
 
-private:
-    class Private;
-    Private *d;
+SearchexpansionFilter::SearchexpansionFilter (QObject* parent, const QVariantList&) :
+    AbstractMessageFilter (parent), d(new Private)
+{
+}
 
-    void generateCache();
-};
+void SearchexpansionFilter::filterMessage (Message& message)
+{
+}
 
-#endif // PLUGIN_CONFIG_MANAGER_H
+K_PLUGIN_FACTORY(MessageFilterFactory, registerPlugin<SearchexpansionFilter>();)
+K_EXPORT_PLUGIN(MessageFilterFactory("ktptextui_message_filter_searchexpansion"))
\ No newline at end of file
diff --git a/filters/images/images-filter.h b/filters/searchexpansion/searchexpansion-filter.h
similarity index 81%
copy from filters/images/images-filter.h
copy to filters/searchexpansion/searchexpansion-filter.h
index 95529b8..d41cc60 100644
--- a/filters/images/images-filter.h
+++ b/filters/searchexpansion/searchexpansion-filter.h
@@ -16,16 +16,17 @@
  *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifndef FORMAT_FILTER_H
-#define FORMAT_FILTER_H
+#ifndef SEARCHEXPANSION_FILTER_H
+#define SEARCHEXPANSION_FILTER_H
+
 #include <KTp/AbstractMessageFilter>
 
-class ImagesFilter : public AbstractMessageFilter
+class SearchexpansionFilter : public AbstractMessageFilter
 {
 Q_OBJECT
 
 public:
-    ImagesFilter (QObject* parent, const QVariantList &);
+    SearchexpansionFilter (QObject* parent, const QVariantList &);
     virtual void filterMessage (Message& message);
 
 private:
@@ -33,4 +34,4 @@ private:
     Private *d;
 };
 
-#endif // FORMAT_FILTER_H
+#endif // SEARCHEXPANSION_FILTER_H

-- 
ktp-text-ui packaging