1 files changed, 9 insertions, 6 deletions

diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 2962951..a6797c9 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -22,51 +22,54 @@
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlayout.h>
 #include <qlist.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else //KAB_EMBEDDED
 extern "C"
 {
-  void* init_kaddrbk_csv_xxport();
-  void* init_kaddrbk_kde2_xxport();
-  void* init_kaddrbk_vcard_xxport();
+  void* init_microkaddrbk_csv_xxport();
+  void* init_microkaddrbk_kde2_xxport();
+  void* init_microkaddrbk_vcard_xxport();
+  void* init_microkaddrbk_opie_xxport();
+  void* init_microkaddrbk_qtopia_xxport();
+  void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 
 #include <libkdepim/addresseeview.h>
 
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 
 #include "xxportmanager.h"
 
 KURL XXPortManager::importURL = KURL();
 QString XXPortManager::importData = QString::null;
 
 class PreviewDialog : public KDialogBase
 {
   public:
     PreviewDialog( const KABC::Addressee &addr,
                    QWidget *parent, const char *name = 0 );
 };
 
 XXPortManager::XXPortManager( KABCore *core, QObject *parent, const char *name )
   : QObject( parent, name ), mCore( core ), mShowPreview( false )
 {
@@ -171,51 +174,51 @@ void XXPortManager::loadPlugins()
   mXXPortObjects.clear();
 
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
     if ( !factory ) {
       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_kaddrbk_csv_xxport()));
-  factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport()));
-  factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport()));
+  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);
   }
 
   QListIterator<XXPortFactory> it(factorylist);
   for ( ; it.current(); ++it )