From ee20630e5298fafdba9702b4ca24f0fbfe31beac Mon Sep 17 00:00:00 2001
From: Matthias Kretz <kretz@kde.org>
Date: Tue, 28 Aug 2007 13:05:35 +0000
Subject: [PATCH] port to KPluginFactory

svn path=/trunk/KDE/kdebase/workspace/; revision=705734
---
 kcmkwin/kwinrules/kcm.cpp           | 11 +++++++----
 kcmkwin/kwinrules/kcm.h             |  5 +----
 kcmkwin/kwinrules/kwinrules.desktop |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index 69e07daf8f..832f1cb5a1 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/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" )
     {
diff --git a/kcmkwin/kwinrules/kcm.h b/kcmkwin/kwinrules/kcm.h
index d9f1a36814..24a1d26873 100644
--- a/kcmkwin/kwinrules/kcm.h
+++ b/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();
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 0e4490ca28..40f7ca3d0b 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/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