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 #include #include #include @@ -20,19 +19,19 @@ License. See the file "COPYING" for the exact licensing terms. #include #include +#include +#include - - - -typedef KGenericFactory KWinCompositingConfigFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kwincompositing, KWinCompositingConfigFactory("kcmkwincompositing")) - +K_PLUGIN_FACTORY(KWinCompositingConfigFactory, + registerPlugin(); + ) +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 -#undef KDE3_SUPPORT #include @@ -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;