port to KPluginFactory
svn path=/trunk/KDE/kdebase/workspace/; revision=705719
This commit is contained in:
parent
c7c502f085
commit
cec2557b3d
3 changed files with 8 additions and 8 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue