[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/colorspaces
From:       Adrian Page <adrian () pagenet ! plus ! com>
Date:       2010-01-07 21:31:23
Message-ID: 1262899883.703924.26452.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1071339 by page:

Fix deprecated warnings by changing

typedef KGenericFactory<Plugin> PluginFactory;
K_EXPORT_COMPONENT_FACTORY(lib, PluginFactory("krita"))

to

K_PLUGIN_FACTORY(PluginFactory, registerPlugin<Plugin>();)
K_EXPORT_PLUGIN(PluginFactory("krita"))

 M  +4 -4      ctlcs/ctl_cs_plugin.cpp  
 M  +3 -2      ctlcs/ctl_cs_plugin.h  
 M  +4 -4      extensions/extensions_plugin.cc  
 M  +2 -1      extensions/extensions_plugin.h  
 M  +4 -4      lms_f32/lms_f32_plugin.cc  
 M  +3 -2      lms_f32/lms_f32_plugin.h  


--- trunk/koffice/krita/plugins/colorspaces/ctlcs/ctl_cs_plugin.cpp #1071338:1071339
@@ -22,7 +22,7 @@
 #include <QMutex>
 
 #include <kcomponentdata.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoBasicHistogramProducers.h>
 #include <KoCtlColorProfile.h>
@@ -40,11 +40,11 @@
 #include "KoCtlColorTransformationFactory.h"
 #include <KoColorTransformationFactoryRegistry.h>
 
-typedef KGenericFactory<CTLCSPlugin> CTLCSPluginPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(krita_ctlcs_plugin, CTLCSPluginPluginFactory("krita"))
+K_PLUGIN_FACTORY(CTLCSPluginPluginFactory, registerPlugin<CTLCSPlugin>();)
+K_EXPORT_PLUGIN(CTLCSPluginPluginFactory("krita"))
 
 
-CTLCSPlugin::CTLCSPlugin(QObject *parent, const QStringList &)
+CTLCSPlugin::CTLCSPlugin(QObject *parent, const QVariantList &)
         : QObject(parent)
 {
     Q_ASSERT(ctlMutex == 0);
--- trunk/koffice/krita/plugins/colorspaces/ctlcs/ctl_cs_plugin.h #1071338:1071339
@@ -20,7 +20,8 @@
 #ifndef CTLCS_PLUGIN_H_
 #define CTLCS_PLUGIN_H_
 
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
 
 /**
  * A plugin wrapper around the LMS F32 color space strategy.
@@ -29,7 +30,7 @@
 {
     Q_OBJECT
 public:
-    CTLCSPlugin(QObject *parent, const QStringList &);
+    CTLCSPlugin(QObject *parent, const QVariantList &);
     virtual ~CTLCSPlugin();
 
 };
--- trunk/koffice/krita/plugins/colorspaces/extensions/extensions_plugin.cc #1071338:1071339
@@ -19,16 +19,16 @@
 
 #include "extensions_plugin.h"
 #include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
 #include <KoColorTransformationFactoryRegistry.h>
 
 #include "kis_hsv_adjustment.h"
 
-typedef KGenericFactory<ExtensionsPlugin> ExtensionsPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(krita_colorspaces_extensions, ExtensionsPluginFactory("krita"))
+K_PLUGIN_FACTORY(ExtensionsPluginFactory, registerPlugin<ExtensionsPlugin>();)
+K_EXPORT_PLUGIN(ExtensionsPluginFactory("krita"))
 
-ExtensionsPlugin::ExtensionsPlugin(QObject *parent, const QStringList &)
+ExtensionsPlugin::ExtensionsPlugin(QObject *parent, const QVariantList &)
 {
     Q_UNUSED(parent);
     KoColorTransformationFactoryRegistry::addColorTransformationFactory(new KisHSVAdjustmentFactory);
--- trunk/koffice/krita/plugins/colorspaces/extensions/extensions_plugin.h #1071338:1071339
@@ -21,12 +21,13 @@
 #define _EXTENSIONS_PLUGIN_H_
 
 #include <QObject>
+#include <QVariant>
 
 class ExtensionsPlugin : public QObject
 {
     Q_OBJECT
 public:
-    ExtensionsPlugin(QObject *parent, const QStringList &);
+    ExtensionsPlugin(QObject *parent, const QVariantList &);
     virtual ~ExtensionsPlugin();
 
 };
--- trunk/koffice/krita/plugins/colorspaces/lms_f32/lms_f32_plugin.cc #1071338:1071339
@@ -24,18 +24,18 @@
 #include "lms_f32_plugin.h"
 
 #include <kcomponentdata.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <KoColorSpaceRegistry.h>
 #include "KoBasicHistogramProducers.h"
 #include <KoCtlColorProfile.h>
 
 #include "kis_lms_f32_colorspace.h"
 
-typedef KGenericFactory<LMSF32Plugin> LMSF32PluginFactory;
-K_EXPORT_COMPONENT_FACTORY(krita_lms_f32_plugin, LMSF32PluginFactory("krita"))
+K_PLUGIN_FACTORY(LMSF32PluginFactory, registerPlugin<LMSF32Plugin>();)
+K_EXPORT_PLUGIN(LMSF32PluginFactory("krita"))
 
 
-LMSF32Plugin::LMSF32Plugin(QObject *parent, const QStringList &)
+LMSF32Plugin::LMSF32Plugin(QObject *parent, const QVariantList &)
         : QObject(parent)
 {
 
--- trunk/koffice/krita/plugins/colorspaces/lms_f32/lms_f32_plugin.h #1071338:1071339
@@ -21,7 +21,8 @@
 #ifndef LMS_F32_PLUGIN_H_
 #define LMS_F32_PLUGIN_H_
 
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
 
 /**
  * A plugin wrapper around the LMS F32 color space strategy.
@@ -30,7 +31,7 @@
 {
     Q_OBJECT
 public:
-    LMSF32Plugin(QObject *parent, const QStringList &);
+    LMSF32Plugin(QObject *parent, const QVariantList &);
     virtual ~LMSF32Plugin();
 
 };
[prev in list] [next in list] [prev in thread] [next in thread]