port to KPluginFactory

svn path=/trunk/KDE/kdebase/workspace/; revision=705734

kcmkwin/kwinrules/kcm.cpp

@@ -19,7 +19,6 @@
 #include "kcm.h"
 
 #include <kglobal.h>
-#include <kgenericfactory.h>
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
@@ -29,14 +28,18 @@
 #include <QtDBus/QtDBus>
 
 #include "ruleslist.h"
+#include <KPluginFactory>
+#include <KPluginLoader>
 
-typedef KGenericFactory<KWin::KCMRules> KCMRulesFactory;
-K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules"))
+K_PLUGIN_FACTORY(KCMRulesFactory,
+        registerPlugin<KWin::KCMRules>();
+        )
+K_EXPORT_PLUGIN(KCMRulesFactory("kcmkwinrules"))
 
 namespace KWin
 {
 
-KCMRules::KCMRules( QWidget *parent, const QStringList & )
+KCMRules::KCMRules( QWidget *parent, const QVariantList & )
 : KCModule( KCMRulesFactory::componentData(), parent )
 , config( "kwinrulesrc" )
     {

kcmkwin/kwinrules/kcm.h

@@ -20,13 +20,10 @@
 #ifndef __KCM_H__
 #define __KCM_H__
 
-#define KDE3_SUPPORT
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
 #include <kconfig.h>
 
 class KConfig;
-class QStringList;
 
 namespace KWin
 {
@@ -38,7 +35,7 @@ class KCMRules
     {
     Q_OBJECT
     public:
-        KCMRules( QWidget *parent, const QStringList &args );
+        KCMRules( QWidget *parent, const QVariantList &args );
         virtual void load();
         virtual void save();
         virtual void defaults();

kcmkwin/kwinrules/kwinrules.desktop

@@ -7,7 +7,6 @@ ServiceTypes=KCModule
 DocPath=kcontrol/windowmanagement/index.html
 
 X-KDE-Library=kcm_kwinrules
-X-KDE-FactoryName=kwinrules
 X-KDE-ParentApp=kcontrol
 
 Name=Window-Specific Settings