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

svn path=/trunk/KDE/kdebase/workspace/; revision=705719
---
 kcmkwin/kwindecoration/kwindecoration.cpp     | 11 +++++++----
 kcmkwin/kwindecoration/kwindecoration.desktop |  1 -
 kcmkwin/kwindecoration/kwindecoration.h       |  4 +---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 32ba4c005a..ea60883a02 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -55,7 +55,6 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kgenericfactory.h>
 #include <kaboutdata.h>
 
 #include "kwindecoration.h"
@@ -63,13 +62,17 @@
 #include <kdecoration_plugins_p.h>
 #include <kdecorationfactory.h>
 #include <kvbox.h>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 // KCModule plugin interface
 // =========================
-typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
+K_PLUGIN_FACTORY(KWinDecoFactory,
+        registerPlugin<KWinDecorationModule>();
+        )
+K_EXPORT_PLUGIN(KWinDecoFactory("kcmkwindecoration"))
 
-KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &)
+KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &)
     : KCModule(KWinDecoFactory::componentData(), parent),
     kwinConfig(KSharedConfig::openConfig("kwinrc")),
     pluginObject(0)
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 141da482c1..cc38df0e1b 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -7,7 +7,6 @@ ServiceTypes=KCModule
 DocPath=kcontrol/kwindecoration/index.html
 
 X-KDE-Library=kcm_kwindecoration
-X-KDE-FactoryName=kcm_kwindecoration
 X-KDE-ParentApp=kcontrol
 
 X-KDE-System-Settings-Parent-Category=appearance
diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h
index bd1bf23e5d..d464f4d6b4 100644
--- a/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kcmkwin/kwindecoration/kwindecoration.h
@@ -30,9 +30,7 @@
 #ifndef KWINDECORATION_H
 #define KWINDECORATION_H
 
-#define KDE3_SUPPORT
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
 #include "buttons.h"
 #include <kconfig.h>
 #include <klibloader.h>
@@ -65,7 +63,7 @@ class KWinDecorationModule : public KCModule, public KDecorationDefines
 	Q_OBJECT
 
 	public:
-		KWinDecorationModule(QWidget* parent, const QStringList &);
+		KWinDecorationModule(QWidget* parent, const QVariantList &);
 		~KWinDecorationModule();
 
 		virtual void load();