summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxportmanager.cpp24
1 files changed, 3 insertions, 21 deletions
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index a6797c9..713b0fc 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -185,53 +185,35 @@ void XXPortManager::loadPlugins()
kdDebug(5720) << "XXPortManager::loadExtensions(): Factory creation failed" << endl;
continue;
}
XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
if ( !xxportFactory ) {
kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl;
continue;
}
#else //KAB_EMBEDDED
QList<XXPortFactory> factorylist;
factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
-
- //add the opie import library dynamically
- KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
- if ( factory ) {
- XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
- factorylist.append(xxportFactory);
- }
-
- //add the qtopia import library dynamically
- factory = KLibLoader::self()->factory( "microkaddrbk_qtopia_xxport" );
- if ( factory ) {
- XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
- factorylist.append(xxportFactory);
- }
-
- //add the sharp import library dynamically
- factory = KLibLoader::self()->factory( "microkaddrbk_sharpdtm_xxport" );
- if ( factory ) {
- XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
- factorylist.append(xxportFactory);
- }
+ factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_opie_xxport()));
+ factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_qtopia_xxport()));
+ factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_sharpdtm_xxport()));
QListIterator<XXPortFactory> it(factorylist);
for ( ; it.current(); ++it )
{
XXPortFactory *xxportFactory = it.current();
#endif //KAB_EMBEDDED
XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );
if ( obj ) {
mCore->addGUIClient( obj );
mXXPortObjects.insert( obj->identifier(), obj );
connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ),
this, SLOT( slotExport( const QString&, const QString& ) ) );
connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ),
this, SLOT( slotImport( const QString&, const QString& ) ) );
}