4 files changed, 12 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index d770a05..22ba681 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,18 @@
 DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
 SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
    libkcal libkdepim kabc  kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
-   kabc/plugins/opie \
+   kabc/plugins/opie kaddressbook/xxport/opie \
          korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
 all: tmake
         for i in $(SUBDIRS); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
@@ -37,24 +37,25 @@ dist:
         mkipks kaddressbook.control
         mkipks kopiemail.control
         mkipks korganizer-alarm.control
 
 tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/converter/opie/Makefile$(PLATFORM) \
+       kaddressbook/xxport/opie/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) 
 
 
 
@@ -79,24 +80,27 @@ korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
         cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
         cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
 
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
         cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
 
 kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
         cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
+
+kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro
+        cd  kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
   
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
         cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
         cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
         cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
         cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.EmbeddedMail b/Makefile.EmbeddedMail
index d770a05..22ba681 100644
--- a/Makefile.EmbeddedMail
+++ b/Makefile.EmbeddedMail
@@ -1,18 +1,18 @@
 DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
 SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
    libkcal libkdepim kabc  kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
-   kabc/plugins/opie \
+   kabc/plugins/opie kaddressbook/xxport/opie \
          korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
 all: tmake
         for i in $(SUBDIRS); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
@@ -37,24 +37,25 @@ dist:
         mkipks kaddressbook.control
         mkipks kopiemail.control
         mkipks korganizer-alarm.control
 
 tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/converter/opie/Makefile$(PLATFORM) \
+       kaddressbook/xxport/opie/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) 
 
 
 
@@ -79,24 +80,27 @@ korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
         cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
         cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
 
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
         cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
 
 kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
         cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
+
+kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro
+        cd  kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
   
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
         cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
         cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
         cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
         cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index 8ee0725..12c83af 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -62,25 +62,25 @@ $Id$
 class OpieXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new OpieXXPort( ab, parent, name );
     }
 };
 
 
 extern "C"
 {
-  void *init_kaddrbk_opie_xxport()
+  void *init_microkaddrbk_opie_xxport()
   {
     return ( new OpieXXPortFactory() );
   }
 }
 
 
 OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import Opie..." ) );
   createExportAction( i18n( "Export Opie..." ) );
 }
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 20cde49..248fcab 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -188,25 +188,25 @@ void XXPortManager::loadPlugins()
     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()));
 
   //now add the opie import library dynamically
-  KLibFactory *factory = KLibLoader::self()->factory( "kaddrbk_opie_xxport" );
+  KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
   if ( factory ) {
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
     factorylist.append(xxportFactory);
   }
 
   QListIterator<XXPortFactory> it(factorylist);  
   for ( ; it.current(); ++it )
   {
     XXPortFactory *xxportFactory = it.current();
 #endif //KAB_EMBEDDED
 
     XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );