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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/access
From:       David Faure <faure () kde ! org>
Date:       2010-10-27 12:12:17
Message-ID: 20101027121217.90CC5AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190330 by dfaure:

port from KGenericFactory to K_PLUGIN_FACTORY


 M  +6 -8      kcmaccess.cpp  
 M  +1 -1      kcmaccess.h  


--- trunk/KDE/kdebase/workspace/kcontrol/access/kcmaccess.cpp #1190329:1190330
@@ -24,6 +24,7 @@
 #include <QGroupBox>
 #include <klocale.h>
 
+#include <KPluginFactory>
 #include <kcombobox.h>
 #include <kstandarddirs.h>
 #include <kcolorbutton.h>
@@ -43,9 +44,8 @@
 
 #include "kcmaccess.moc"
 
-#include <kgenericfactory.h>
-typedef KGenericFactory<KAccessConfig, QWidget> KAccessConfigFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_access, KAccessConfigFactory("kcmaccess"))
+K_PLUGIN_FACTORY(KAccessConfigFactory, registerPlugin<KAccessConfig>();)
+K_EXPORT_PLUGIN(KAccessConfigFactory("kcmaccess"))
 
 ExtendedIntNumInput::ExtendedIntNumInput
 				(QWidget* parent)
@@ -230,7 +230,7 @@
   return result;
 }
 
-KAccessConfig::KAccessConfig(QWidget *parent, const QStringList& args)
+KAccessConfig::KAccessConfig(QWidget *parent, const QVariantList& args)
   : KCModule(KAccessConfigFactory::componentData(), parent, args)
 {
 
@@ -850,10 +850,8 @@
    */
   KDE_EXPORT void kcminit_access()
   {
-    KConfig *config = new KConfig( "kaccessrc", KConfig::NoGlobals );
-    bool run = needToRunKAccessDaemon( config );
-
-    delete config;
+    KConfig config("kaccessrc", KConfig::NoGlobals);
+    const bool run = needToRunKAccessDaemon(&config);
     if (run)
       KToolInvocation::startServiceByDesktopName("kaccess");
   }
--- trunk/KDE/kdebase/workspace/kcontrol/access/kcmaccess.h #1190329:1190330
@@ -62,7 +62,7 @@
 
 public:
 
-  KAccessConfig( QWidget *parent, const QStringList& );
+  KAccessConfig( QWidget *parent, const QVariantList& );
   virtual ~KAccessConfig();
   
   void load();
[prev in list] [next in list] [prev in thread] [next in thread]