[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/krita/plugins/tools
From: Adrian Page <adrian () pagenet ! plus ! com>
Date: 2010-01-15 22:29:06
Message-ID: 1263594546.209203.13101.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1075355 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 defaulttools/default_tools.cc
M +2 -1 defaulttools/default_tools.h
M +4 -4 selectiontools/selection_tools.cc
M +3 -2 selectiontools/selection_tools.h
M +4 -4 tool_crop/tool_crop.cc
M +3 -2 tool_crop/tool_crop.h
M +4 -4 tool_curves/tool_curves.cc
M +3 -2 tool_curves/tool_curves.h
M +4 -5 tool_dyna/tool_dyna.cpp
M +3 -2 tool_dyna/tool_dyna.h
M +4 -8 tool_grid/tool_grid.cc
M +3 -2 tool_grid/tool_grid.h
M +4 -5 tool_perspectivegrid/tool_perspectivegrid.cc
M +3 -2 tool_perspectivegrid/tool_perspectivegrid.h
M +4 -5 tool_perspectivetransform/tool_perspectivetransform.cc
M +3 -2 tool_perspectivetransform/tool_perspectivetransform.h
M +4 -4 tool_polygon/tool_polygon.cc
M +3 -2 tool_polygon/tool_polygon.h
M +4 -5 tool_polyline/tool_polyline.cc
M +3 -2 tool_polyline/tool_polyline.h
M +4 -5 tool_star/tool_star.cc
M +3 -2 tool_star/tool_star.h
M +4 -5 tool_transform/tool_transform.cc
M +3 -2 tool_transform/tool_transform.h
--- trunk/koffice/krita/plugins/tools/defaulttools/default_tools.cc #1075354:1075355
@@ -22,7 +22,7 @@
#include <QStringList>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_tool.h>
#include <KoToolRegistry.h>
@@ -40,11 +40,11 @@
#include "kis_tool_path.h"
#include "kis_tool_move.h"
-typedef KGenericFactory<DefaultTools> DefaultToolsFactory;
-K_EXPORT_COMPONENT_FACTORY(kritadefaulttools, DefaultToolsFactory("krita"))
+K_PLUGIN_FACTORY(DefaultToolsFactory, registerPlugin<DefaultTools>();)
+K_EXPORT_PLUGIN(DefaultToolsFactory("krita"))
-DefaultTools::DefaultTools(QObject *parent, const QStringList &)
+DefaultTools::DefaultTools(QObject *parent, const QVariantList &)
: QObject(parent)
{
KoToolRegistry * r = KoToolRegistry::instance();
--- trunk/koffice/krita/plugins/tools/defaulttools/default_tools.h #1075354:1075355
@@ -20,6 +20,7 @@
#define DEFAULT_TOOLS_H_
#include <QObject>
+#include <QVariant>
/**
* A module wrapper around Krita's default tools.
@@ -35,7 +36,7 @@
{
Q_OBJECT
public:
- DefaultTools(QObject *parent, const QStringList &);
+ DefaultTools(QObject *parent, const QVariantList &);
virtual ~DefaultTools();
};
--- trunk/koffice/krita/plugins/tools/selectiontools/selection_tools.cc \
#1075354:1075355 @@ -22,7 +22,7 @@
#include <klocale.h>
#include <kcomponentdata.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "KoToolRegistry.h"
@@ -37,11 +37,11 @@
#include "kis_tool_select_path.h"
#include "kis_tool_select_similar.h"
-typedef KGenericFactory<SelectionTools> SelectionToolsFactory;
-K_EXPORT_COMPONENT_FACTORY(kritaselectiontools, SelectionToolsFactory("krita"))
+K_PLUGIN_FACTORY(SelectionToolsFactory, registerPlugin<SelectionTools>();)
+K_EXPORT_PLUGIN(SelectionToolsFactory("krita"))
-SelectionTools::SelectionTools(QObject *parent, const QStringList &)
+SelectionTools::SelectionTools(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(SelectionToolsFactory::componentData());
--- trunk/koffice/krita/plugins/tools/selectiontools/selection_tools.h \
#1075354:1075355 @@ -19,7 +19,8 @@
#ifndef SELECTION_TOOLS_H_
#define SELECTION_TOOLS_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module wrapper around Krita's selection tools.
@@ -35,7 +36,7 @@
{
Q_OBJECT
public:
- SelectionTools(QObject *parent, const QStringList &);
+ SelectionTools(QObject *parent, const QVariantList &);
virtual ~SelectionTools();
};
--- trunk/koffice/krita/plugins/tools/tool_crop/tool_crop.cc #1075354:1075355
@@ -32,17 +32,17 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
#include <KoToolRegistry.h>
-typedef KGenericFactory<ToolCrop> ToolCropFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolcrop, ToolCropFactory("krita"))
+K_PLUGIN_FACTORY(ToolCropFactory, registerPlugin<ToolCrop>();)
+K_EXPORT_PLUGIN(ToolCropFactory("krita"))
-ToolCrop::ToolCrop(QObject *parent, const QStringList &)
+ToolCrop::ToolCrop(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolCropFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_crop/tool_crop.h #1075354:1075355
@@ -19,7 +19,8 @@
#ifndef TOOL_CROP_H_
#define TOOL_CROP_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a crop tool.
@@ -28,7 +29,7 @@
{
Q_OBJECT
public:
- ToolCrop(QObject *parent, const QStringList &);
+ ToolCrop(QObject *parent, const QVariantList &);
virtual ~ToolCrop();
};
--- trunk/koffice/krita/plugins/tools/tool_curves/tool_curves.cc #1075354:1075355
@@ -29,7 +29,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -41,10 +41,10 @@
#include "kis_tool_moutline.h"
//#include "kis_tool_example.h"
-typedef KGenericFactory<ToolCurves> ToolCurvesFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolcurves, ToolCurvesFactory("krita"))
+K_PLUGIN_FACTORY(ToolCurvesFactory, registerPlugin<ToolCurves>();)
+K_EXPORT_PLUGIN(ToolCurvesFactory("krita"))
-ToolCurves::ToolCurves(QObject *parent, const QStringList &)
+ToolCurves::ToolCurves(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolCurvesFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_curves/tool_curves.h #1075354:1075355
@@ -21,13 +21,14 @@
#ifndef TOOL_CURVES_H
#define TOOL_CURVES_H
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
class ToolCurves : public QObject
{
Q_OBJECT
public:
- ToolCurves(QObject *parent, const QStringList &);
+ ToolCurves(QObject *parent, const QVariantList &);
virtual ~ToolCurves();
};
--- trunk/koffice/krita/plugins/tools/tool_dyna/tool_dyna.cpp #1075354:1075355
@@ -32,7 +32,7 @@
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kis_paint_device.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -41,12 +41,11 @@
#include "kis_tool_dyna.h"
+K_PLUGIN_FACTORY(ToolDynaFactory, registerPlugin<ToolDyna>();)
+K_EXPORT_PLUGIN(ToolDynaFactory("krita"))
-typedef KGenericFactory<ToolDyna> ToolDynaFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatooldyna, ToolDynaFactory("krita"))
-
-ToolDyna::ToolDyna(QObject *parent, const QStringList &)
+ToolDyna::ToolDyna(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolDynaFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_dyna/tool_dyna.h #1075354:1075355
@@ -19,7 +19,8 @@
#ifndef TOOL_DYNA_H_
#define TOOL_DYNA_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a polygon tool.
@@ -30,7 +31,7 @@
public:
- ToolDyna(QObject *parent, const QStringList &);
+ ToolDyna(QObject *parent, const QVariantList &);
virtual ~ToolDyna();
};
--- trunk/koffice/krita/plugins/tools/tool_grid/tool_grid.cc #1075354:1075355
@@ -29,21 +29,17 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
#include <KoToolRegistry.h>
+K_PLUGIN_FACTORY(GridFactory, registerPlugin<GridPlugin>();)
+K_EXPORT_PLUGIN(GridFactory("krita"))
-
-
-typedef KGenericFactory<GridPlugin> GridFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolgrid, GridFactory("krita"))
-
-
-GridPlugin::GridPlugin(QObject *parent, const QStringList &)
+GridPlugin::GridPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(GridFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_grid/tool_grid.h #1075354:1075355
@@ -18,13 +18,14 @@
#ifndef _GRID_H_
#define _GRID_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
class GridPlugin : public QObject
{
Q_OBJECT
public:
- GridPlugin(QObject *parent, const QStringList &);
+ GridPlugin(QObject *parent, const QVariantList &);
virtual ~GridPlugin();
};
--- trunk/koffice/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc \
#1075354:1075355 @@ -29,7 +29,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -38,12 +38,11 @@
#include "kis_tool_perspectivegrid.h"
+K_PLUGIN_FACTORY(ToolPerspectiveGridFactory, registerPlugin<ToolPerspectiveGrid>();)
+K_EXPORT_PLUGIN(ToolPerspectiveGridFactory("krita"))
-typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolperspectivegrid, \
ToolPerspectiveGridFactory("krita"))
-
-ToolPerspectiveGrid::ToolPerspectiveGrid(QObject *parent, const QStringList &)
+ToolPerspectiveGrid::ToolPerspectiveGrid(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolPerspectiveGridFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h \
#1075354:1075355 @@ -18,7 +18,8 @@
#ifndef TOOL_PERSPECTIVE_GRID_H_
#define TOOL_PERSPECTIVE_GRID_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a tool for editing the perspective grid.
@@ -27,7 +28,7 @@
{
Q_OBJECT
public:
- ToolPerspectiveGrid(QObject *parent, const QStringList &);
+ ToolPerspectiveGrid(QObject *parent, const QVariantList &);
virtual ~ToolPerspectiveGrid();
};
--- trunk/koffice/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc \
#1075354:1075355 @@ -31,7 +31,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -40,12 +40,11 @@
#include "kis_tool_perspectivetransform.h"
+K_PLUGIN_FACTORY(ToolPerspectiveTransformFactory, \
registerPlugin<ToolPerspectiveTransform>();) \
+K_EXPORT_PLUGIN(ToolPerspectiveTransformFactory("krita"))
-typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolperspectivetransform, \
ToolPerspectiveTransformFactory("krita"))
-
-ToolPerspectiveTransform::ToolPerspectiveTransform(QObject *parent, const \
QStringList &) +ToolPerspectiveTransform::ToolPerspectiveTransform(QObject *parent, \
const QVariantList &) : QObject(parent)
{
//setComponentData(ToolPerspectiveTransformFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h \
#1075354:1075355 @@ -18,7 +18,8 @@
#ifndef TOOL_PERSPECTIVE_TRANSFORM_H_
#define TOOL_PERSPECTIVE_TRANSFORM_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a tool for doinge perspective transformation.
@@ -27,7 +28,7 @@
{
Q_OBJECT
public:
- ToolPerspectiveTransform(QObject *parent, const QStringList &);
+ ToolPerspectiveTransform(QObject *parent, const QVariantList &);
virtual ~ToolPerspectiveTransform();
};
--- trunk/koffice/krita/plugins/tools/tool_polygon/tool_polygon.cc #1075354:1075355
@@ -31,7 +31,7 @@
#include <kstandarddirs.h>
#include <kis_debug.h>
#include <kis_paint_device.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -39,11 +39,11 @@
#include "kis_tool_polygon.h"
-typedef KGenericFactory<ToolPolygon> ToolPolygonFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolpolygon, ToolPolygonFactory("krita"))
+K_PLUGIN_FACTORY(ToolPolygonFactory, registerPlugin<ToolPolygon>();)
+K_EXPORT_PLUGIN(ToolPolygonFactory("krita"))
-ToolPolygon::ToolPolygon(QObject *parent, const QStringList &)
+ToolPolygon::ToolPolygon(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolPolygonFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_polygon/tool_polygon.h #1075354:1075355
@@ -19,7 +19,8 @@
#ifndef TOOL_POLYGON_H_
#define TOOL_POLYGON_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a polygon tool.
@@ -30,7 +31,7 @@
public:
- ToolPolygon(QObject *parent, const QStringList &);
+ ToolPolygon(QObject *parent, const QVariantList &);
virtual ~ToolPolygon();
};
--- trunk/koffice/krita/plugins/tools/tool_polyline/tool_polyline.cc #1075354:1075355
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -39,12 +39,11 @@
#include "kis_tool_polyline.h"
+K_PLUGIN_FACTORY(ToolPolylineFactory, registerPlugin<ToolPolyline>();)
+K_EXPORT_PLUGIN(ToolPolylineFactory("krita"))
-typedef KGenericFactory<ToolPolyline> ToolPolylineFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolpolyline, ToolPolylineFactory("krita"))
-
-ToolPolyline::ToolPolyline(QObject *parent, const QStringList &)
+ToolPolyline::ToolPolyline(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolPolylineFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_polyline/tool_polyline.h #1075354:1075355
@@ -19,7 +19,8 @@
#ifndef TOOL_POLYLINE_H_
#define TOOL_POLYLINE_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a polyline tool.
@@ -28,7 +29,7 @@
{
Q_OBJECT
public:
- ToolPolyline(QObject *parent, const QStringList &);
+ ToolPolyline(QObject *parent, const QVariantList &);
virtual ~ToolPolyline();
};
--- trunk/koffice/krita/plugins/tools/tool_star/tool_star.cc #1075354:1075355
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_paint_device.h>
#include <kis_selection.h>
#include <kis_global.h>
@@ -40,12 +40,11 @@
#include "kis_tool_star.h"
+K_PLUGIN_FACTORY(ToolStarFactory, registerPlugin<ToolStar>();)
+K_EXPORT_PLUGIN(ToolStarFactory("krita"))
-typedef KGenericFactory<ToolStar> ToolStarFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatoolstar, ToolStarFactory("krita"))
-
-ToolStar::ToolStar(QObject *parent, const QStringList &)
+ToolStar::ToolStar(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolStarFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_star/tool_star.h #1075354:1075355
@@ -19,7 +19,8 @@
#ifndef TOOL_STAR_H_
#define TOOL_STAR_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a star tool.
@@ -28,7 +29,7 @@
{
Q_OBJECT
public:
- ToolStar(QObject *parent, const QStringList &);
+ ToolStar(QObject *parent, const QVariantList &);
virtual ~ToolStar();
};
--- trunk/koffice/krita/plugins/tools/tool_transform/tool_transform.cc \
#1075354:1075355 @@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kis_debug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kis_global.h>
#include <kis_types.h>
@@ -39,12 +39,11 @@
#include "kis_tool_transform.h"
+K_PLUGIN_FACTORY(ToolTransformFactory, registerPlugin<ToolTransform>();)
+K_EXPORT_PLUGIN(ToolTransformFactory("krita"))
-typedef KGenericFactory<ToolTransform> ToolTransformFactory;
-K_EXPORT_COMPONENT_FACTORY(kritatooltransform, ToolTransformFactory("krita"))
-
-ToolTransform::ToolTransform(QObject *parent, const QStringList &)
+ToolTransform::ToolTransform(QObject *parent, const QVariantList &)
: QObject(parent)
{
//setComponentData(ToolTransformFactory::componentData());
--- trunk/koffice/krita/plugins/tools/tool_transform/tool_transform.h \
#1075354:1075355 @@ -19,7 +19,8 @@
#ifndef TOOL_TRANSFORM_H_
#define TOOL_TRANSFORM_H_
-#include <kparts/plugin.h>
+#include <QObject>
+#include <QVariant>
/**
* A module that provides a transform tool.
@@ -28,7 +29,7 @@
{
Q_OBJECT
public:
- ToolTransform(QObject *parent, const QStringList &);
+ ToolTransform(QObject *parent, const QVariantList &);
virtual ~ToolTransform();
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic