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

List:       kde-commits
Subject:    koffice
From:       Fredy Yanardi <fyanardi () gmail ! com>
Date:       2007-09-04 11:51:35
Message-ID: 1188906695.515715.4231.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 708280 by fyanardi:

port to KPluginFactory for Text-Editing Plugins


 M  +7 -4      plugins/autocorrection/AutocorrectPlugin.cpp  
 M  +3 -2      plugins/autocorrection/AutocorrectPlugin.h  
 M  +6 -4      plugins/changecase/ChangecasePlugin.cpp  
 M  +3 -2      plugins/changecase/ChangecasePlugin.h  
 M  +6 -4      plugins/spellcheck/SpellCheckPlugin.cpp  
 M  +3 -2      plugins/spellcheck/SpellCheckPlugin.h  
 M  +6 -4      tools/thesaurus/ThesaurusPlugin.cpp  
 M  +3 -2      tools/thesaurus/ThesaurusPlugin.h  


--- trunk/koffice/plugins/autocorrection/AutocorrectPlugin.cpp #708279:708280
@@ -16,16 +16,19 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+
 #include "AutocorrectPlugin.h"
 #include "AutocorrectFactory.h"
-#include <kgenericfactory.h>
 
+#include <KPluginFactory>
+#include <KPluginLoader>
+
 #include <KoTextEditingRegistry.h>
 
-K_EXPORT_COMPONENT_FACTORY(autocorrect,
-                           KGenericFactory<AutocorrectPlugin>( "AutocorrectPlugin" ) )
+K_PLUGIN_FACTORY( AutocorrectPluginFactory, registerPlugin<AutocorrectPlugin>(); );
+K_EXPORT_PLUGIN( AutocorrectPluginFactory("AutocorrectPlugin") );
 
-AutocorrectPlugin::AutocorrectPlugin( QObject *parent, const QStringList& )
+AutocorrectPlugin::AutocorrectPlugin( QObject *parent, const QVariantList& )
     : QObject(parent)
 {
     KoTextEditingRegistry::instance()->add( new AutocorrectFactory( parent));
--- trunk/koffice/plugins/autocorrection/AutocorrectPlugin.h #708279:708280
@@ -19,13 +19,14 @@
 #ifndef AUTOCORRECTPLUGIN_H
 #define AUTOCORRECTPLUGIN_H
 
-#include <QObject>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 class AutocorrectPlugin : public QObject {
     Q_OBJECT
 
 public:
-    AutocorrectPlugin(QObject * parent,  const QStringList & );
+    AutocorrectPlugin(QObject * parent,  const QVariantList & );
     ~AutocorrectPlugin() {}
 };
 
--- trunk/koffice/plugins/changecase/ChangecasePlugin.cpp #708279:708280
@@ -19,13 +19,15 @@
 #include "ChangecasePlugin.h"
 #include "ChangecaseFactory.h"
 
+#include <KPluginFactory>
+#include <KPluginLoader>
+
 #include <KoTextEditingRegistry.h>
-#include <kgenericfactory.h>
 
-K_EXPORT_COMPONENT_FACTORY(changecase,
-        KGenericFactory<ChangecasePlugin>( "ChangecasePlugin" ) )
+K_PLUGIN_FACTORY( ChangecasePluginFactory, registerPlugin<ChangecasePlugin>(); );
+K_EXPORT_PLUGIN( ChangecasePluginFactory("ChangecasePlugin") );
 
-ChangecasePlugin::ChangecasePlugin( QObject *parent, const QStringList& )
+ChangecasePlugin::ChangecasePlugin( QObject *parent, const QVariantList& )
     : QObject(parent)
 {
     KoTextEditingRegistry::instance()->add( new ChangecaseFactory( parent));
--- trunk/koffice/plugins/changecase/ChangecasePlugin.h #708279:708280
@@ -20,13 +20,14 @@
 #ifndef CHANGECASEPLUGIN_H
 #define CHANGECASEPLUGIN_H
 
-#include <QObject>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 class ChangecasePlugin : public QObject {
     Q_OBJECT
 
 public:
-    ChangecasePlugin(QObject * parent,  const QStringList & );
+    ChangecasePlugin(QObject * parent,  const QVariantList & );
     ~ChangecasePlugin() {}
 };
 
--- trunk/koffice/plugins/spellcheck/SpellCheckPlugin.cpp #708279:708280
@@ -20,13 +20,15 @@
 #include "SpellCheckPlugin.h"
 #include "SpellCheckFactory.h"
 
+#include <KPluginFactory>
+#include <KPluginLoader>
+
 #include <KoTextEditingRegistry.h>
-#include <kgenericfactory.h>
 
-K_EXPORT_COMPONENT_FACTORY(spellcheck,
-        KGenericFactory<SpellCheckPlugin>( "SpellCheckPlugin" ) )
+K_PLUGIN_FACTORY( SpellCheckPluginFactory, registerPlugin<SpellCheckPlugin>(); );
+K_EXPORT_PLUGIN( SpellCheckPluginFactory("SpellCheckPlugin") );
 
-SpellCheckPlugin::SpellCheckPlugin( QObject *parent, const QStringList& )
+SpellCheckPlugin::SpellCheckPlugin( QObject *parent, const QVariantList& )
     : QObject(parent)
 {
     KoTextEditingRegistry::instance()->add( new SpellCheckFactory( parent));
--- trunk/koffice/plugins/spellcheck/SpellCheckPlugin.h #708279:708280
@@ -20,13 +20,14 @@
 #ifndef SPELLCHECKPLUGIN_H
 #define SPELLCHECKPLUGIN_H
 
-#include <QObject>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 class SpellCheckPlugin : public QObject {
     Q_OBJECT
 
 public:
-    SpellCheckPlugin(QObject * parent,  const QStringList &);
+    SpellCheckPlugin(QObject * parent,  const QVariantList &);
     ~SpellCheckPlugin() {}
 };
 
--- trunk/koffice/tools/thesaurus/ThesaurusPlugin.cpp #708279:708280
@@ -20,13 +20,15 @@
 #include "ThesaurusPlugin.h"
 #include "ThesaurusFactory.h"
 
+#include <KPluginFactory>
+#include <KPluginLoader>
+
 #include <KoTextEditingRegistry.h>
-#include <kgenericfactory.h>
 
-K_EXPORT_COMPONENT_FACTORY(thesaurustool,
-        KGenericFactory<ThesaurusPlugin>("ThesaurusPlugin"))
+K_PLUGIN_FACTORY( ThesaurusPluginFactory, registerPlugin<ThesaurusPlugin>(); );
+K_EXPORT_PLUGIN( ThesaurusPluginFactory("ThesaurusPlugin") );
 
-ThesaurusPlugin::ThesaurusPlugin(QObject *parent, const QStringList&)
+ThesaurusPlugin::ThesaurusPlugin(QObject *parent, const QVariantList&)
     : QObject(parent)
 {
     KoTextEditingRegistry::instance()->add(new ThesaurusFactory(parent));
--- trunk/koffice/tools/thesaurus/ThesaurusPlugin.h #708279:708280
@@ -20,13 +20,14 @@
 #ifndef THESAURUSPLUGIN_H
 #define THESAURUSPLUGIN_H
 
-#include <QObject>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 class ThesaurusPlugin : public QObject {
     Q_OBJECT
 
 public:
-    ThesaurusPlugin(QObject * parent,  const QStringList &);
+    ThesaurusPlugin(QObject * parent,  const QVariantList &);
     ~ThesaurusPlugin() {}
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]