[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kwallet/konfigurator
From:       Laurent Montel <montel () kde ! org>
Date:       2007-09-18 11:20:24
Message-ID: 1190114424.683112.983.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 713955 by mlaurent:

Port to new kpluginsfactory


 M  +6 -4      konfigurator.cpp  
 M  +1 -3      konfigurator.h  


--- trunk/KDE/kdeutils/kwallet/konfigurator/konfigurator.cpp #713954:713955
@@ -23,7 +23,8 @@
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdialog.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 #include <kinputdialog.h>
 #include <kmenu.h>
 #include <kwallet.h>
@@ -40,10 +41,11 @@
 #include <kconfiggroup.h>
 #define KWALLETMANAGERINTERFACE "org.kde.KWallet"
 
-typedef KGenericFactory<KWalletConfig, QWidget> KWalletFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
+K_PLUGIN_FACTORY(KWalletFactory, registerPlugin<KWalletConfig>();)
+K_EXPORT_PLUGIN(KWalletFactory("kcmkwallet"))
 
-KWalletConfig::KWalletConfig(QWidget *parent, const QStringList& args)
+
+KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList& args)
 : KCModule(KWalletFactory::componentData(), parent, args) {
 
 	KAboutData *about =
--- trunk/KDE/kdeutils/kwallet/konfigurator/konfigurator.h #713954:713955
@@ -19,9 +19,7 @@
 
 #ifndef _KWALLETKONFIGURATOR_H
 #define _KWALLETKONFIGURATOR_H
-#define KDE3_SUPPORT
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
 #include "ui_walletconfigwidget.h"
 class KConfig;
 class Q3ListViewItem;
@@ -38,7 +36,7 @@
 class KWalletConfig : public KCModule {
 	Q_OBJECT
 	public:
-		explicit KWalletConfig(QWidget *parent = 0L, const QStringList& = QStringList());
+		explicit KWalletConfig(QWidget *parent = 0L, const QVariantList& = QVariantList());
 		virtual ~KWalletConfig();
 
 		void load();
[prev in list] [next in list] [prev in thread] [next in thread]