[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime
From: Alex Merry <huntedhacker () tiscali ! co ! uk>
Date: 2007-08-31 22:09:11
Message-ID: 1188598151.078509.4915.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 707058 by alexmerry:
KLibFactory => KPluginFactory conversions.
These old-style plugins seem to be the cause of the crashes
I get when exiting systemsettings.
M +6 -4 kcontrol/dnssd/kcmdnssd.cpp
M +1 -1 kcontrol/dnssd/kcmdnssd.h
M +6 -4 kcontrol/knotify/knotify.cpp
M +1 -1 kcontrol/knotify/knotify.h
M +0 -1 kcontrol/locale/CMakeLists.txt
D kcontrol/locale/main.cpp
M +9 -1 kcontrol/locale/toplevel.cpp
M +2 -3 kcontrol/locale/toplevel.h
M +3 -3 kdeprint/kdeprint_part/printpart.cpp
M +1 -1 kdeprint/kdeprint_part/printpart.h
M +5 -4 kioslave/cgi/kcmcgi/kcmcgi.cpp
M +1 -1 kioslave/cgi/kcmcgi/kcmcgi.h
M +3 -3 kurifilter-plugins/fixhost/fixhosturifilter.cpp
M +1 -1 kurifilter-plugins/fixhost/fixhosturifilter.h
M +3 -3 kurifilter-plugins/ikws/kuriikwsfilter.cpp
M +1 -1 kurifilter-plugins/ikws/kuriikwsfilter.h
M +3 -3 kurifilter-plugins/ikws/kurisearchfilter.cpp
M +1 -1 kurifilter-plugins/ikws/kurisearchfilter.h
M +3 -3 kurifilter-plugins/localdomain/localdomainurifilter.cpp
M +1 -1 kurifilter-plugins/localdomain/localdomainurifilter.h
M +3 -3 kurifilter-plugins/shorturi/kshorturifilter.cpp
M +1 -1 kurifilter-plugins/shorturi/kshorturifilter.h
--- trunk/KDE/kdebase/runtime/kcontrol/dnssd/kcmdnssd.cpp #707057:707058
@@ -30,8 +30,10 @@
#include <QTextStream>
#include <klocale.h>
+#include <kaboutdata.h>
#include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
#include <klineedit.h>
#include <kpassworddialog.h>
#include <kconfig.h>
@@ -44,10 +46,10 @@
#define MDNSD_CONF "/etc/mdnsd.conf"
#define MDNSD_PID "/var/run/mdnsd.pid"
-typedef KGenericFactory<KCMDnssd, QWidget> KCMDnssdFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
+K_PLUGIN_FACTORY(KCMDnssdFactory, registerPlugin<KCMDnssd>();)
+K_EXPORT_PLUGIN(KCMDnssdFactory("kcmkdnssd"))
-KCMDnssd::KCMDnssd(QWidget *parent, const QStringList&)
+KCMDnssd::KCMDnssd(QWidget *parent, const QVariantList&)
: KCModule( KCMDnssdFactory::componentData(), parent)
{
--- trunk/KDE/kdebase/runtime/kcontrol/dnssd/kcmdnssd.h #707057:707058
@@ -32,7 +32,7 @@
Q_OBJECT
public:
- explicit KCMDnssd( QWidget *parent=0, const QStringList& = QStringList() );
+ explicit KCMDnssd( QWidget *parent=0, const QVariantList& = QVariantList() );
~KCMDnssd();
virtual void save();
private:
--- trunk/KDE/kdebase/runtime/kcontrol/knotify/knotify.cpp #707057:707058
@@ -29,10 +29,12 @@
#include <kapplication.h>
+#include <kaboutdata.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <knotifyconfigwidget.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
#include <kstandarddirs.h>
#include <kurlcompletion.h>
#include <kurlrequester.h>
@@ -43,10 +45,10 @@
static const int COL_FILENAME = 1;
-typedef KGenericFactory<KCMKNotify, QWidget> NotifyFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") )
+K_PLUGIN_FACTORY( NotifyFactory, registerPlugin<KCMKNotify>(); )
+K_EXPORT_PLUGIN( NotifyFactory("kcmnotify") )
- KCMKNotify::KCMKNotify(QWidget *parent, const QStringList & )
+ KCMKNotify::KCMKNotify(QWidget *parent, const QVariantList & )
: KCModule(NotifyFactory::componentData(), parent/*, name*/),
m_playerSettings( 0L )
{
--- trunk/KDE/kdebase/runtime/kcontrol/knotify/knotify.h #707057:707058
@@ -48,7 +48,7 @@
Q_OBJECT
public:
- KCMKNotify(QWidget *parent, const QStringList &);
+ KCMKNotify(QWidget *parent, const QVariantList &);
virtual ~KCMKNotify();
virtual void defaults();
--- trunk/KDE/kdebase/runtime/kcontrol/locale/CMakeLists.txt #707057:707058
@@ -7,7 +7,6 @@
########### next target ###############
set(kcm_locale_PART_SRCS
- main.cpp
toplevel.cpp
kcmlocale.cpp
klocalesample.cpp
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.cpp #707057:707058
@@ -44,9 +44,17 @@
#include "toplevel.moc"
#include "ui_toplevelbase.h"
#include <kconfiggroup.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
+K_PLUGIN_FACTORY(KLocaleFactory,
+ KLocale::setMainCatalog("kcmlocale");
+ registerPlugin<KLocaleApplication>();
+ )
+K_EXPORT_PLUGIN(KLocaleFactory("kcmlocale"))
+
KLocaleApplication::KLocaleApplication(QWidget *parent,
- const QStringList &args)
+ const QVariantList &args)
: KCModule( KLocaleFactory::componentData(), parent, args)
{
KAboutData* aboutData = new KAboutData("kcmlocale", 0,
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.h #707057:707058
@@ -28,7 +28,7 @@
#define KDE3_SUPPORT
#include <kcmodule.h>
#undef KDE3_SUPPORT
-#include <kgenericfactory.h>
+#include <klocale.h>
#include <kconfig.h>
class QTabWidget;
@@ -47,7 +47,7 @@
Q_OBJECT
public:
- KLocaleApplication(QWidget *parent, const QStringList &);
+ KLocaleApplication(QWidget *parent, const QVariantList &);
virtual ~KLocaleApplication();
virtual void load();
@@ -83,6 +83,5 @@
KSharedConfigPtr m_nullConfig;
};
-typedef KGenericFactory<KLocaleApplication, QWidget > KLocaleFactory;
#endif
--- trunk/KDE/kdebase/runtime/kdeprint/kdeprint_part/printpart.cpp #707057:707058
@@ -30,12 +30,12 @@
#include <kparts/genericfactory.h>
#include <QWidget>
-typedef KParts::GenericFactory<PrintPart> PrintPartFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory )
+K_PLUGIN_FACTORY(PrintPartFactory, registerPlugin<PrintPart>();)
+K_EXPORT_PLUGIN(PrintPartFactory)
PrintPart::PrintPart(QWidget *parentWidget,
QObject *parent,
- const QStringList & /*args*/ )
+ const QVariantList & /*args*/ )
: KParts::ReadOnlyPart(parent)
{
setComponentData(PrintPartFactory::componentData());
--- trunk/KDE/kdebase/runtime/kdeprint/kdeprint_part/printpart.h #707057:707058
@@ -34,7 +34,7 @@
public:
PrintPart(QWidget *parentWidget,
QObject *parent,
- const QStringList & );
+ const QVariantList & );
virtual ~PrintPart();
static KAboutData *createAboutData();
--- trunk/KDE/kdebase/runtime/kioslave/cgi/kcmcgi/kcmcgi.cpp #707057:707058
@@ -20,7 +20,8 @@
#include <KComponentData>
#include <KConfig>
#include <KFileDialog>
-#include <KGenericFactory>
+#include <KPluginFactory>
+#include <KPluginLoader>
#include <KGlobal>
#include <KHBox>
#include <KLocale>
@@ -34,10 +35,10 @@
#include "kcmcgi.h"
#include "kcmcgi.moc"
-typedef KGenericFactory<KCMCgi> KCMCgiFactory;
-K_EXPORT_COMPONENT_FACTORY(cgi, KCMCgiFactory("kcmcgi"))
+K_PLUGIN_FACTORY(KCMCgiFactory, registerPlugin<KCMCgi>();)
+K_EXPORT_PLUGIN(KCMCgiFactory("kcmcgi"))
-KCMCgi::KCMCgi(QWidget *parent, const QStringList &)
+KCMCgi::KCMCgi(QWidget *parent, const QVariantList &)
: KCModule(KCMCgiFactory::componentData(), parent)
{
setButtons(Default|Apply);
--- trunk/KDE/kdebase/runtime/kioslave/cgi/kcmcgi/kcmcgi.h #707057:707058
@@ -32,7 +32,7 @@
{
Q_OBJECT
public:
- KCMCgi(QWidget *parent, const QStringList &args);
+ KCMCgi(QWidget *parent, const QVariantList &args);
~KCMCgi();
void load();
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/fixhost/fixhosturifilter.cpp #707057:707058
@@ -33,7 +33,7 @@
* kdelibs/kio/tests/kurifiltertest
*/
-FixHostUriFilter::FixHostUriFilter( QObject *parent, const QStringList & /*args*/ )
+FixHostUriFilter::FixHostUriFilter( QObject *parent, const QVariantList & /*args*/ )
: KUriFilterPlugin( "fixhosturifilter", parent )
{
}
@@ -68,7 +68,7 @@
return( resolver.start() && resolver.wait( 5000 ) && resolver.error() == KResolver::NoError );
}
-K_EXPORT_COMPONENT_FACTORY( libfixhosturifilter,
- KGenericFactory<FixHostUriFilter>( "kcmkurifilt" ) )
+K_PLUGIN_FACTORY(FixHostUriFilterFactory, registerPlugin<FixHostUriFilter>();)
+K_EXPORT_PLUGIN(FixHostUriFilterFactory("kcmkurifilt"))
#include "fixhosturifilter.moc"
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/fixhost/fixhosturifilter.h #707057:707058
@@ -36,7 +36,7 @@
Q_OBJECT
public:
- FixHostUriFilter( QObject* parent, const QStringList& args );
+ FixHostUriFilter( QObject* parent, const QVariantList& args );
virtual bool filterUri( KUriFilterData &data ) const;
private:
static bool exists( const KUrl& url );
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/kuriikwsfilter.cpp #707057:707058
@@ -36,10 +36,10 @@
* kdelibs/kio/tests/kurifiltertest
*/
-typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory;
-K_EXPORT_COMPONENT_FACTORY (libkuriikwsfilter, KAutoWebSearchFactory("kcmkurifilt"))
+K_PLUGIN_FACTORY(KAutoWebSearchFactory, registerPlugin<KAutoWebSearch>();)
+K_EXPORT_PLUGIN(KAutoWebSearchFactory("kcmkurifilt"))
-KAutoWebSearch::KAutoWebSearch(QObject *parent, const QStringList&)
+KAutoWebSearch::KAutoWebSearch(QObject *parent, const QVariantList&)
:KUriFilterPlugin( "KURIIKWSFilterIface", parent )
{
KGlobal::locale()->insertCatalog("kurifilter");
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/kuriikwsfilter.h #707057:707058
@@ -30,7 +30,7 @@
{
Q_OBJECT
public:
- explicit KAutoWebSearch(QObject *parent = 0, const QStringList &args = QStringList() );
+ explicit KAutoWebSearch(QObject *parent = 0, const QVariantList &args = QVariantList() );
~KAutoWebSearch();
virtual bool filterUri( KUriFilterData& ) const;
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/kurisearchfilter.cpp #707057:707058
@@ -37,11 +37,11 @@
* kdelibs/kio/tests/kurifiltertest
*/
-typedef KGenericFactory<KUriSearchFilter> KUriSearchFilterFactory;
-K_EXPORT_COMPONENT_FACTORY(libkurisearchfilter, KUriSearchFilterFactory("kcmkurifilt"))
+K_PLUGIN_FACTORY(KUriSearchFilterFactory, registerPlugin<KUriSearchFilter>();)
+K_EXPORT_PLUGIN(KUriSearchFilterFactory("kcmkurifilt"))
KUriSearchFilter::KUriSearchFilter(QObject *parent,
- const QStringList &)
+ const QVariantList &)
:KUriFilterPlugin( "KUriSearchFilter", parent )
{
KGlobal::locale()->insertCatalog("kurifilter");
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/kurisearchfilter.h #707057:707058
@@ -30,7 +30,7 @@
{
Q_OBJECT
public:
- explicit KUriSearchFilter(QObject *parent = 0, const QStringList &args = QStringList() );
+ explicit KUriSearchFilter(QObject *parent = 0, const QVariantList &args = QVariantList() );
~KUriSearchFilter();
virtual bool filterUri( KUriFilterData& ) const;
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/localdomain/localdomainurifilter.cpp #707057:707058
@@ -36,7 +36,7 @@
* kdelibs/kio/tests/kurifiltertest
*/
-LocalDomainUriFilter::LocalDomainUriFilter( QObject *parent, const QStringList & /*args*/ )
+LocalDomainUriFilter::LocalDomainUriFilter( QObject *parent, const QVariantList & /*args*/ )
: KUriFilterPlugin( "localdomainurifilter", parent ),
last_time( 0 ),
m_hostPortPattern( QLatin1String(HOSTPORT_PATTERN) )
@@ -111,7 +111,7 @@
// nothing
}
-K_EXPORT_COMPONENT_FACTORY( liblocaldomainurifilter,
- KGenericFactory<LocalDomainUriFilter>( "kcmkurifilt" ) )
+K_PLUGIN_FACTORY(LocalDomainUriFilterFactory, registerPlugin<LocalDomainUriFilter>();)
+K_EXPORT_PLUGIN(LocalDomainUriFilterFactory("kcmkurifilt"))
#include "localdomainurifilter.moc"
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/localdomain/localdomainurifilter.h #707057:707058
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- LocalDomainUriFilter( QObject* parent, const QStringList& args );
+ LocalDomainUriFilter( QObject* parent, const QVariantList& args );
virtual bool filterUri( KUriFilterData &data ) const;
public Q_SLOTS:
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp #707057:707058
@@ -146,7 +146,7 @@
return cmd;
}
-KShortUriFilter::KShortUriFilter( QObject *parent, const QStringList & /*args*/ )
+KShortUriFilter::KShortUriFilter( QObject *parent, const QVariantList & /*args*/ )
:KUriFilterPlugin( "kshorturifilter", parent )
{
QDBusConnection::sessionBus().connect(QString(), QString(), "org.kde.KUriFilterPlugin",
@@ -570,7 +570,7 @@
}
}
-K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
- KGenericFactory<KShortUriFilter>( "kcmkurifilt" ) )
+K_PLUGIN_FACTORY(KShortUriFilterFactory, registerPlugin<KShortUriFilter>();)
+K_EXPORT_PLUGIN(KShortUriFilterFactory("kcmkurifilt"))
#include "kshorturifilter.moc"
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/shorturi/kshorturifilter.h #707057:707058
@@ -47,7 +47,7 @@
* @param parent the parent of this class.
* @param name the internal name for this object.
*/
- explicit KShortUriFilter( QObject *parent = 0, const QStringList &args = QStringList() );
+ explicit KShortUriFilter( QObject *parent = 0, const QVariantList &args = QVariantList() );
/**
* Destructor
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic