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

List:       kde-commits
Subject:    [calligra/frameworks] libs: Adapt sample code to K_PLUGIN_FACTORY_WITH_JSON
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 21:22:16
Message-ID: E1Yd3c0-0000GH-2G () scm ! kde ! org
[Download RAW message or body]

Git commit b7c246512a388b45a0a7b5ea9e6ec492ca534192 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 21:18.
Pushed by kossebau into branch 'frameworks'.

Adapt sample code to K_PLUGIN_FACTORY_WITH_JSON

M  +1    -2    libs/flake/KoToolFactoryBase.h
M  +1    -2    libs/koplugin/KoPluginLoader.h

http://commits.kde.org/calligra/b7c246512a388b45a0a7b5ea9e6ec492ca534192

diff --git a/libs/flake/KoToolFactoryBase.h b/libs/flake/KoToolFactoryBase.h
index d517af5..bc1ce55 100644
--- a/libs/flake/KoToolFactoryBase.h
+++ b/libs/flake/KoToolFactoryBase.h
@@ -47,8 +47,7 @@ public:
     ~MyToolFactory() {}
     KoToolBase *createTool(KoCanvasBase *canvas);
 };
-K_PLUGIN_FACTORY(MyToolFactoryFactory, registerPlugin<MyToolFactory>();)
-K_EXPORT_PLUGIN(MyToolFactoryFactory("MyTool"))
+K_PLUGIN_FACTORY_WITH_JSON((MyToolFactoryFactory, "mytool.json", registerP=
lugin<MyToolFactory>();)
 </pre>
 =

  */
diff --git a/libs/koplugin/KoPluginLoader.h b/libs/koplugin/KoPluginLoader.h
index 191a1a0..ca31a68 100644
--- a/libs/koplugin/KoPluginLoader.h
+++ b/libs/koplugin/KoPluginLoader.h
@@ -50,8 +50,7 @@ public:
 #include "MyPlugin.h"
 #include <kpluginfactory.h>
 =

-K_PLUGIN_FACTORY_WITH_JSON(MyPluginFactory, MyPlugin.jsonregisterPlugin<My=
Plugin>();)
-//K_EXPORT_PLUGIN(MyPluginFactory("DaPlugin"))
+K_PLUGIN_FACTORY_WITH_JSON(MyPluginFactory, "myplugin.json", registerPlugi=
n<MyPlugin>();)
 =

 MyPlugin::MyPlugin( QObject *parent, const QVariantList& ) : QObject(paren=
t) {
     // do stuff like creating a factory and adding it to the

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