SVN commit 1282459 by dfaure: Port to K_EXPORT_PLUGIN/K_PLUGIN_FACTORY, but this stuff uses KoTool.h which doesn't seem to exist anymore. CCMAIL: calligra-devel@kde.org
M +4 -4 %{APPNAME}Plugin.cpp M +2 -2 %{APPNAME}Plugin.h --- trunk/KDE/kdesdk/kapptemplate/templates/C++/flake/%{APPNAME}Plugin.cpp #1282458:1282459 @@ -3,12 +3,12 @@ #include <KoToolRegistry.h> #include "%{APPNAME}ShapeFactory.h" #include "%{APPNAME}ToolFactory.h" -#include <KGenericFactory> +#include <KPluginFactory> -K_EXPORT_COMPONENT_FACTORY(%{APPNAMELC}shape, - KGenericFactory<%{APPNAME}Plugin>( "%{APPNAME}" ) ) +K_PLUGIN_FACTORY(%{APPNAME}PluginFactory, registerPlugin<%{APPNAME}Plugin>(); ) +K_EXPORT_PLUGIN(%{APPNAME}PluginFactory("%{APPNAME}")) -%{APPNAME}Plugin::%{APPNAME}Plugin(QObject *parent, const QStringList&) : QObject(parent) +%{APPNAME}Plugin::%{APPNAME}Plugin(QObject *parent, const QVariantList&) : QObject(parent) { KoShapeRegistry::instance()->add(new %{APPNAME}ShapeFactory(parent)); KoToolRegistry::instance()->add(new %{APPNAME}ToolFactory(parent)); --- trunk/KDE/kdesdk/kapptemplate/templates/C++/flake/%{APPNAME}Plugin.h #1282458:1282459 @@ -3,12 +3,12 @@ #include <QObject> -#include <QStringList> +class QVariantList; class %{APPNAME}Plugin : public QObject { public: - %{APPNAME}Plugin(QObject *parent = 0, const QStringList& args = QStringList()); + %{APPNAME}Plugin(QObject *parent, const QVariantList& args); }; #endif // %{APPNAME}Plugin.h _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel