[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=1244fe9

The following commit has been merged in the master branch:
commit 1244fe9ac2d8144b7ca23d3a3fd4e986cd7d2dd6
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jul 14 22:05:35 2012 +1000

    Create PluginConfigManager
    
    Move the job of keeping a lists of offers and plugins out of
    MessageProccessor to a this new class.
    
    It also makes the KSharedConfig::Ptr for MessagesConfig.
---
 lib/CMakeLists.txt                                 |  1 +
 lib/plugin-config-manager.cpp                      | 94 ++++++++++++++++++++++
 .../format-filter.h => lib/plugin-config-manager.h | 30 ++++---
 3 files changed, 114 insertions(+), 11 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9dd485e..aed670a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -17,6 +17,7 @@ set(ktpchat_SRCS
         message-processor.cpp
         url-filter.cpp
         escape-filter.cpp
+        plugin-config-manager.cpp
 )
 
 set(ktpchat_HDRS
diff --git a/lib/plugin-config-manager.cpp b/lib/plugin-config-manager.cpp
new file mode 100644
index 0000000..c3c828b
--- /dev/null
+++ b/lib/plugin-config-manager.cpp
@@ -0,0 +1,94 @@
+/*
+ *    Copyright (C) 2012  Lasath Fernando <kde at lasath.org>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License as published by the Free Software Foundation; either
+ *    version 2.1 of the License, or (at your option) any later version.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "plugin-config-manager.h"
+
+#include <QMutex>
+#include <QSet>
+
+#include <KGlobal>
+#include <KDebug>
+#include <KServiceTypeTrader>
+
+typedef QSet<KPluginInfo> PluginSet;
+
+class PluginConfigManager::Private {
+public:
+    PluginSet all;
+    PluginSet enabled;
+};
+
+PluginConfigManager *PluginConfigManager::self()
+{
+    static PluginConfigManager *pcm_instance = new PluginConfigManager();
+    static QMutex mutex;
+    if (!pcm_instance)
+    {
+        mutex.lock();
+        if (!pcm_instance) {
+            pcm_instance = new PluginConfigManager;
+        }
+        mutex.unlock();
+    }
+    return pcm_instance;
+}
+
+PluginConfigManager::PluginConfigManager() :
+    d(new Private)
+{
+    generateCache();
+}
+
+KService::List offers() {
+    return KServiceTypeTrader::self()->query(QLatin1String("KTpTextUi/MessageFilter"));
+}
+
+void PluginConfigManager::generateCache()
+{
+    KPluginInfo::List all = KPluginInfo::fromServices(offers(), configGroup());
+    for (KPluginInfo::List::Iterator i = all.begin(); i != all.end(); i++) {
+        KPluginInfo &plugin = *i;
+
+        d->all.insert(plugin);
+
+        plugin.load();
+        if (plugin.isPluginEnabled()) {
+            d->enabled.insert(plugin);
+        }
+    }
+}
+
+KPluginInfo::List PluginConfigManager::allPlugins() const
+{
+    return d->all.toList();
+}
+
+KPluginInfo::List PluginConfigManager::enabledPlugins() const
+{
+    return d->enabled.toList();
+}
+
+KConfigGroup PluginConfigManager::configGroup() const
+{
+    return sharedConfig()->group("Plugins");
+}
+
+KSharedConfig::Ptr PluginConfigManager::sharedConfig() const
+{
+    return KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
+}
diff --git a/filters/formatting/format-filter.h b/lib/plugin-config-manager.h
similarity index 65%
copy from filters/formatting/format-filter.h
copy to lib/plugin-config-manager.h
index f3d8387..4307b55 100644
--- a/filters/formatting/format-filter.h
+++ b/lib/plugin-config-manager.h
@@ -16,23 +16,31 @@
  *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifndef FORMAT_FILTER_H
-#define FORMAT_FILTER_H
-#include <KTp/AbstractMessageFilter>
+#ifndef PLUGIN_CONFIG_MANAGER_H
+#define PLUGIN_CONFIG_MANAGER_H
 
-class FormatFilter : public AbstractMessageFilter
-{
-Q_OBJECT
+#include <KPluginInfo>
+#include <ktpchat_export.h>
 
+class KDE_TELEPATHY_CHAT_EXPORT PluginConfigManager
+{
 public:
-    FormatFilter (QObject* parent, const QVariantList &);
-    virtual void filterMessage (Message& message);
+    static PluginConfigManager* self();
 
-private:
-    void addTag (const char *markingCharacter, char htmlTag);
+    KPluginInfo::List allPlugins() const;
+    KPluginInfo::List enabledPlugins() const;
+
+    KConfigGroup       configGroup() const;
+    KSharedConfig::Ptr sharedConfig() const;
 
+protected:
+    PluginConfigManager();
+
+private:
     class Private;
     Private *d;
+
+    void generateCache();
 };
 
-#endif // FORMAT_FILTER_H
+#endif // PLUGIN_CONFIG_MANAGER_H

-- 
ktp-text-ui packaging