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

List:       kde-commits
Subject:    KDE/kdebase
From:       David Faure <faure () kde ! org>
Date:       2010-11-04 22:33:17
Message-ID: 20101104223317.0D8A5AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193171 by dfaure:

port to K_PLUGIN_FACTORY / K_EXPORT_PLUGIN


 M  +1 -1      apps/konqueror/sidebar/sidebar_part.cpp  
 M  +4 -4      runtime/khelpcenter/htmlsearch/kcmhtmlsearch.cpp  
 M  +2 -1      runtime/khelpcenter/htmlsearch/kcmhtmlsearch.h  
 M  +1 -1      workspace/kcontrol/screensaver/scrnsave.cpp  
 M  +4 -4      workspace/kcontrol/smartcard/smartcard.cpp  
 M  +2 -1      workspace/kcontrol/smartcard/smartcard.h  
 M  +3 -3      workspace/libs/solid/control/backends/fakebluetooth/module.cpp  


--- trunk/KDE/kdebase/apps/konqueror/sidebar/sidebar_part.cpp #1193170:1193171
@@ -34,7 +34,7 @@
 K_PLUGIN_FACTORY(KonqSidebarFactory,
                  registerPlugin<KonqSidebarPart>();
     )
-K_EXPORT_COMPONENT_FACTORY(konq_sidebar, KonqSidebarFactory(createAboutData()))
+K_EXPORT_PLUGIN(KonqSidebarFactory(createAboutData()))
 
 KonqSidebarPart::KonqSidebarPart(QWidget *parentWidget, QObject *parent, const \
QVariantList&)  : KParts::ReadOnlyPart(parent)
--- trunk/KDE/kdebase/runtime/khelpcenter/htmlsearch/kcmhtmlsearch.cpp \
#1193170:1193171 @@ -31,14 +31,14 @@
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <ktoolinvocation.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
 #include "kcmhtmlsearch.moc"
 
-typedef KGenericFactory<KHTMLSearchConfig> KHTMLSearchConfigFactory;
-K_EXPORT_COMPONENT_FACTORY(htmlsearch, KHTMLSearchConfigFactory("kcmhtmlsearch"))
+K_PLUGIN_FACTORY(KHTMLSearchConfigFactory, registerPlugin<KHTMLSearchConfig>();)
+K_EXPORT_PLUGIN(KHTMLSearchConfigFactory("kcmhtmlsearch"))
 
-KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const QStringList &)
+KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const QVariantList &)
   : KCModule(KHTMLSearchConfigFactory::componentData(), parent), indexProc(0)
 {
   QVBoxLayout *vbox = new QVBoxLayout(this);
--- trunk/KDE/kdebase/runtime/khelpcenter/htmlsearch/kcmhtmlsearch.h #1193170:1193171
@@ -25,6 +25,7 @@
 #define KDE3_SUPPORT
 #include <kcmodule.h>
 #undef KDE3_SUPPORT
+#include <QVariantList>
 
 
 class QCheckBox;
@@ -41,7 +42,7 @@
 
 public:
 
-  KHTMLSearchConfig(QWidget *parent, const QStringList &args);
+  KHTMLSearchConfig(QWidget *parent, const QVariantList &args);
   virtual ~KHTMLSearchConfig();
   
   void load();
--- trunk/KDE/kdebase/workspace/kcontrol/screensaver/scrnsave.cpp #1193170:1193171
@@ -89,7 +89,7 @@
 //===========================================================================
 // DLL Interface for kcontrol
 K_PLUGIN_FACTORY(KSSFactory,
-        registerPlugin<KScreenSaver>(); // K_EXPORT_COMPONENT_FACTORY (screensaver
+        registerPlugin<KScreenSaver>();
 )
 K_EXPORT_PLUGIN(KSSFactory("kcmscreensaver"))
 
--- trunk/KDE/kdebase/workspace/kcontrol/smartcard/smartcard.cpp #1193170:1193171
@@ -40,14 +40,14 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmenu.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
 #include "smartcard.h"
 
-typedef KGenericFactory<KSmartcardConfig> KSmartcardConfigFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_smartcard, KSmartcardConfigFactory("kcmsmartcard"))
+K_PLUGIN_FACTORY(KSmartcardConfigFactory, registerPlugin<KSmartcardConfig>();)
+K_EXPORT_PLUGIN(KSmartcardConfigFactory("kcmsmartcard"))
 
-KSmartcardConfig::KSmartcardConfig(QWidget *parent, const QStringList &)
+KSmartcardConfig::KSmartcardConfig(QWidget *parent, const QVariantList &)
   : KCModule(KSmartcardConfig::componentData(), parent)
   , DCOPObject("kcmsmartcard")
 {
--- trunk/KDE/kdebase/workspace/kcontrol/smartcard/smartcard.h #1193170:1193171
@@ -27,6 +27,7 @@
 
 #define KDE3_SUPPORT
 #include <kcmodule.h>
+#include <QVariantList>
 #undef KDE3_SUPPORT
 
 #include "smartcardbase.h"
@@ -45,7 +46,7 @@
 
 
 public:
-  KSmartcardConfig(QWidget *parent, const QStringList &args)
+  KSmartcardConfig(QWidget *parent, const QVariantList &args)
   virtual ~KSmartcardConfig();
 
   SmartcardBase *base;
--- trunk/KDE/kdebase/workspace/libs/solid/control/backends/fakebluetooth/module.cpp \
#1193170:1193171 @@ -21,8 +21,8 @@
 #include "fakebluetoothmanager.h"
 
 // KDE includes
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
-typedef KGenericFactory<FakeBluetoothManager, \
                Solid::Control::Ifaces::BluetoothManager> \
                FakeBluetoothBackendFactory;
-K_EXPORT_COMPONENT_FACTORY(solid_fake_bluetoothmgmt, \
FakeBluetoothBackendFactory("fakebluetoothbackend")) \
+K_PLUGIN_FACTORY(FakeBluetoothBackendFactory, \
registerPlugin<FakeBluetoothManager>();) \
+K_EXPORT_PLUGIN(FakeBluetoothBackendFactory("fakebluetoothbackend"))  


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