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

svn path=/trunk/KDE/kdebase/workspace/; revision=705731
---
 kcmkwin/kwincompositing/kwincompositing.desktop |  1 -
 kcmkwin/kwincompositing/main.cpp                | 15 +++++++--------
 kcmkwin/kwincompositing/main.h                  |  4 +---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index 9e874dc020..1333aa15ac 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -7,7 +7,6 @@ ServiceTypes=KCModule
 DocPath=kcontrol/kwincompositing/index.html
 
 X-KDE-Library=kcm_kwincompositing
-X-KDE-FactoryName=kcm_kwincompositing
 X-KDE-ParentApp=kcontrol
 
 Name=Desktop Effects
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index 073584474c..f812947894 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -12,7 +12,6 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "advanced.h"
 
-#include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
@@ -20,19 +19,19 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <ksettings/dispatcher.h>
 
 #include <QtDBus/QtDBus>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
-
-
-
-typedef KGenericFactory<KWin::KWinCompositingConfig> KWinCompositingConfigFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwincompositing, KWinCompositingConfigFactory("kcmkwincompositing"))
-
+K_PLUGIN_FACTORY(KWinCompositingConfigFactory,
+        registerPlugin<KWin::KWinCompositingConfig>();
+        )
+K_EXPORT_PLUGIN(KWinCompositingConfigFactory("kcmkwincompositing"))
 
 namespace KWin
 {
 
 
-KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QStringList &)
+KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList &)
     : KCModule( KWinCompositingConfigFactory::componentData(), parent),
         mKWinConfig(KSharedConfig::openConfig("kwinrc"))
 {
diff --git a/kcmkwin/kwincompositing/main.h b/kcmkwin/kwincompositing/main.h
index 535a8950de..20aa4c8fe4 100644
--- a/kcmkwin/kwincompositing/main.h
+++ b/kcmkwin/kwincompositing/main.h
@@ -12,9 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#define KDE3_SUPPORT
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
 
 #include <ksharedconfig.h>
 
@@ -29,7 +27,7 @@ class KWinCompositingConfig : public KCModule
     {
     Q_OBJECT
     public:
-        KWinCompositingConfig(QWidget *parent, const QStringList &args);
+        KWinCompositingConfig(QWidget *parent, const QVariantList &args);
         virtual ~KWinCompositingConfig();
 
         virtual QString quickHelp() const;