Commit f96f0da6 authored by Adrian Page's avatar Adrian 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"))

svn path=/trunk/koffice/; revision=1075350
parent 74297fda
......@@ -23,7 +23,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -33,11 +33,11 @@
#include "kis_global.h"
typedef KGenericFactory<ChalkPaintOpPlugin> ChalkPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritachalkpaintop, ChalkPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(ChalkPaintOpPluginFactory, registerPlugin<ChalkPaintOpPlugin>();)
K_EXPORT_PLUGIN(ChalkPaintOpPluginFactory("krita"))
ChalkPaintOpPlugin::ChalkPaintOpPlugin(QObject *parent, const QStringList &)
ChalkPaintOpPlugin::ChalkPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//
......
......@@ -19,7 +19,8 @@
#ifndef CHALK_PAINTOP_PLUGIN_H_
#define CHALK_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class ChalkPaintOpPlugin : public QObject
{
Q_OBJECT
public:
ChalkPaintOpPlugin(QObject *parent, const QStringList &);
ChalkPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~ChalkPaintOpPlugin();
};
......
......@@ -25,10 +25,10 @@
#include <kis_paintop_registry.h>
#include <QStringList>
typedef KGenericFactory<ComplexBrush> ComplexBrushFactory;
K_EXPORT_COMPONENT_FACTORY(kritacomplexbrush, ComplexBrushFactory("krita"))
K_PLUGIN_FACTORY(ComplexBrushFactory, registerPlugin<ComplexBrush>();)
K_EXPORT_PLUGIN(ComplexBrushFactory("krita"))
ComplexBrush::ComplexBrush(QObject *parent, const QStringList &sl)
ComplexBrush::ComplexBrush(QObject *parent, const QVariantList &sl)
: QObject(parent)
{
Q_UNUSED(sl)
......
......@@ -19,7 +19,8 @@
#ifndef COMPLEX_BRUSH_H
#define COMPLEX_BRUSH_H
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
class QStringList;
......@@ -27,7 +28,7 @@ class ComplexBrush : public QObject
{
Q_OBJECT
public:
ComplexBrush(QObject *parent, const QStringList &sl);
ComplexBrush(QObject *parent, const QVariantList &);
~ComplexBrush();
};
......
......@@ -24,7 +24,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -33,11 +33,11 @@
#include "kis_simple_paintop_factory.h"
#include "kis_global.h"
typedef KGenericFactory<CurvePaintOpPlugin> CurvePaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritacurvepaintop, CurvePaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(CurvePaintOpPluginFactory, registerPlugin<CurvePaintOpPlugin>();)
K_EXPORT_PLUGIN(CurvePaintOpPluginFactory("krita"))
CurvePaintOpPlugin::CurvePaintOpPlugin(QObject *parent, const QStringList &)
CurvePaintOpPlugin::CurvePaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(CurvePaintOpPluginFactory::componentData());
......
......@@ -19,7 +19,8 @@
#ifndef CURVE_PAINTOP_PLUGIN_H_
#define CURVE_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class CurvePaintOpPlugin : public QObject
{
Q_OBJECT
public:
CurvePaintOpPlugin(QObject *parent, const QStringList &);
CurvePaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~CurvePaintOpPlugin();
};
......
......@@ -24,7 +24,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include "kis_simple_paintop_factory.h"
#include "kis_airbrushop.h"
......@@ -43,11 +43,11 @@
#include "kis_global.h"
#include "kis_paintop_registry.h"
typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritadefaultpaintops, DefaultPaintOpsPluginFactory("krita"))
K_PLUGIN_FACTORY(DefaultPaintOpsPluginFactory, registerPlugin<DefaultPaintOpsPlugin>();)
K_EXPORT_PLUGIN(DefaultPaintOpsPluginFactory("krita"))
DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(QObject *parent, const QStringList &)
DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(DefaultPaintOpsPluginFactory::componentData());
......
......@@ -19,7 +19,8 @@
#ifndef DEFAULT_PAINTOPS_PLUGIN_H_
#define DEFAULT_PAINTOPS_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class DefaultPaintOpsPlugin : public QObject
{
Q_OBJECT
public:
DefaultPaintOpsPlugin(QObject *parent, const QStringList &);
DefaultPaintOpsPlugin(QObject *parent, const QVariantList &);
virtual ~DefaultPaintOpsPlugin();
};
......
......@@ -22,7 +22,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -30,11 +30,11 @@
#include "kis_deform_paintop_factory.h"
#include "kis_global.h"
typedef KGenericFactory<DeformPaintOpPlugin> DeformPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritadeformpaintop, DeformPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(DeformPaintOpPluginFactory, registerPlugin<DeformPaintOpPlugin>();)
K_EXPORT_PLUGIN(DeformPaintOpPluginFactory("krita"))
DeformPaintOpPlugin::DeformPaintOpPlugin(QObject *parent, const QStringList &)
DeformPaintOpPlugin::DeformPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(DeformPaintOpPluginFactory::componentData());
......
......@@ -19,7 +19,8 @@
#ifndef DEFORM_PAINTOP_PLUGIN_H_
#define DEFORM_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class DeformPaintOpPlugin : public QObject
{
Q_OBJECT
public:
DeformPaintOpPlugin(QObject *parent, const QStringList &);
DeformPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~DeformPaintOpPlugin();
};
......
......@@ -22,7 +22,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -32,11 +32,11 @@
#include "kis_global.h"
typedef KGenericFactory<DynaPaintOpPlugin> DynaPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritadynapaintop, DynaPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(DynaPaintOpPluginFactory, registerPlugin<DynaPaintOpPlugin>();)
K_EXPORT_PLUGIN(DynaPaintOpPluginFactory("krita"))
DynaPaintOpPlugin::DynaPaintOpPlugin(QObject *parent, const QStringList &)
DynaPaintOpPlugin::DynaPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//
......
......@@ -19,7 +19,8 @@
#ifndef DYNA_PAINTOP_PLUGIN_H_
#define DYNA_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class DynaPaintOpPlugin : public QObject
{
Q_OBJECT
public:
DynaPaintOpPlugin(QObject *parent, const QStringList &);
DynaPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~DynaPaintOpPlugin();
};
......
......@@ -22,7 +22,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -31,11 +31,11 @@
#include "kis_global.h"
typedef KGenericFactory<ExperimentPaintOpPlugin> ExperimentPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritaexperimentpaintop, ExperimentPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(ExperimentPaintOpPluginFactory, registerPlugin<ExperimentPaintOpPlugin>();)
K_EXPORT_PLUGIN(ExperimentPaintOpPluginFactory("krita"))
ExperimentPaintOpPlugin::ExperimentPaintOpPlugin(QObject *parent, const QStringList &)
ExperimentPaintOpPlugin::ExperimentPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ExperimentPaintOpPluginFactory::componentData());
......
......@@ -19,7 +19,8 @@
#ifndef EXPERIMENT_PAINTOP_PLUGIN_H_
#define EXPERIMENT_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class ExperimentPaintOpPlugin : public QObject
{
Q_OBJECT
public:
ExperimentPaintOpPlugin(QObject *parent, const QStringList &);
ExperimentPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~ExperimentPaintOpPlugin();
};
......
......@@ -22,16 +22,16 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
#include "kis_filterop_factory.h"
typedef KGenericFactory<FilterOp> FilterOpFactory;
K_EXPORT_COMPONENT_FACTORY(kritafilterop, FilterOpFactory("krita"))
K_PLUGIN_FACTORY(FilterOpFactory, registerPlugin<FilterOp>();)
K_EXPORT_PLUGIN(FilterOpFactory("krita"))
FilterOp::FilterOp(QObject *parent, const QStringList &)
FilterOp::FilterOp(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(FilterOpFactory::componentData());
......
......@@ -19,13 +19,14 @@
#ifndef _FILTEROP_H_
#define _FILTEROP_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
class FilterOp : public QObject
{
Q_OBJECT
public:
FilterOp(QObject *parent, const QStringList &);
FilterOp(QObject *parent, const QVariantList &);
virtual ~FilterOp();
};
......
......@@ -22,7 +22,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -31,11 +31,11 @@
#include "kis_global.h"
typedef KGenericFactory<GridPaintOpPlugin> GridPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritagridpaintop, GridPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(GridPaintOpPluginFactory, registerPlugin<GridPaintOpPlugin>();)
K_EXPORT_PLUGIN(GridPaintOpPluginFactory("krita"))
GridPaintOpPlugin::GridPaintOpPlugin(QObject *parent, const QStringList &)
GridPaintOpPlugin::GridPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//
......
......@@ -19,7 +19,8 @@
#ifndef GRID_PAINTOP_PLUGIN_H_
#define GRID_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class GridPaintOpPlugin : public QObject
{
Q_OBJECT
public:
GridPaintOpPlugin(QObject *parent, const QStringList &);
GridPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~GridPaintOpPlugin();
};
......
......@@ -22,18 +22,18 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
#include "mypaint_paintop_factory.h"
#include "kis_global.h"
typedef KGenericFactory<MyPaintPlugin> MyPaintPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritamypaintpaintop, MyPaintPluginFactory("krita"))
K_PLUGIN_FACTORY(MyPaintPluginFactory, registerPlugin<MyPaintPlugin>();)
K_EXPORT_PLUGIN(MyPaintPluginFactory("krita"))
MyPaintPlugin::MyPaintPlugin(QObject *parent, const QStringList &)
MyPaintPlugin::MyPaintPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(MyPaintPluginFactory::componentData());
......
......@@ -19,7 +19,8 @@
#ifndef MYPAINT_PAINTOP_PLUGIN_H_
#define MYPAINT_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class MyPaintPlugin : public QObject
{
Q_OBJECT
public:
MyPaintPlugin(QObject *parent, const QStringList &);
MyPaintPlugin(QObject *parent, const QVariantList &);
virtual ~MyPaintPlugin();
};
......
......@@ -23,7 +23,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
#include <kis_simple_paintop_factory.h>
......@@ -32,11 +32,11 @@
#include "kis_global.h"
typedef KGenericFactory<SoftPaintOpPlugin> SoftPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritasoftpaintop, SoftPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(SoftPaintOpPluginFactory, registerPlugin<SoftPaintOpPlugin>();)
K_EXPORT_PLUGIN(SoftPaintOpPluginFactory("krita"))
SoftPaintOpPlugin::SoftPaintOpPlugin(QObject *parent, const QStringList &)
SoftPaintOpPlugin::SoftPaintOpPlugin(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
setComponentData(SoftPaintOpPluginFactory::componentData());
......
......@@ -19,6 +19,8 @@
#ifndef SOFT_PAINTOP_PLUGIN_H_
#define SOFT_PAINTOP_PLUGIN_H_
#include <QVariant>
#include <kparts/plugin.h>
/**
......@@ -28,7 +30,7 @@ class SoftPaintOpPlugin : public KParts::Plugin
{
Q_OBJECT
public:
SoftPaintOpPlugin(QObject *parent, const QStringList &);
SoftPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~SoftPaintOpPlugin();
};
......
......@@ -22,7 +22,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -31,11 +31,11 @@
#include "kis_global.h"
typedef KGenericFactory<SprayPaintOpPlugin> SprayPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritaspraypaintop, SprayPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(SprayPaintOpPluginFactory, registerPlugin<SprayPaintOpPlugin>();)
K_EXPORT_PLUGIN(SprayPaintOpPluginFactory("krita"))
SprayPaintOpPlugin::SprayPaintOpPlugin(QObject *parent, const QStringList &)
SprayPaintOpPlugin::SprayPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//
......
......@@ -19,7 +19,8 @@
#ifndef SPRAY_PAINTOP_PLUGIN_H_
#define SPRAY_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class SprayPaintOpPlugin : public QObject
{
Q_OBJECT
public:
SprayPaintOpPlugin(QObject *parent, const QStringList &);
SprayPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~SprayPaintOpPlugin();
};
......
......@@ -24,7 +24,7 @@
#include <kcomponentdata.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kgenericfactory.h>
#include <kpluginfactory.h>
#include <kis_paintop_registry.h>
......@@ -32,11 +32,11 @@
#include "kis_sumi_paintop.h"
#include "kis_global.h"
typedef KGenericFactory<SumiPaintOpPlugin> SumiPaintOpPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kritasumipaintop, SumiPaintOpPluginFactory("krita"))
K_PLUGIN_FACTORY(SumiPaintOpPluginFactory, registerPlugin<SumiPaintOpPlugin>();)
K_EXPORT_PLUGIN(SumiPaintOpPluginFactory("krita"))
SumiPaintOpPlugin::SumiPaintOpPlugin(QObject *parent, const QStringList &)
SumiPaintOpPlugin::SumiPaintOpPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
......
......@@ -19,7 +19,8 @@
#ifndef SUMI_PAINTOP_PLUGIN_H_
#define SUMI_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <QObject>
#include <QVariant>
/**
* A plugin wrapper that adds the paintop factories to the paintop registry.
......@@ -28,7 +29,7 @@ class SumiPaintOpPlugin : public QObject
{
Q_OBJECT
public:
SumiPaintOpPlugin(QObject *parent, const QStringList &);
SumiPaintOpPlugin(QObject *parent, const QVariantList &);
virtual ~SumiPaintOpPlugin();
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment