support for export of categories und supression of empty fields

2 files changed, 14 insertions, 3 deletions

diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index d1def18..8ee0725 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -98,37 +98,47 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
   if ( fileName.isEmpty() )
     return true;
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
 	
   if ( !access ) {
     qDebug("Unable to access file() %s", fileName.latin1());
     addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) );
     return false;
   }
 
+  KABC::OpieConverter mConverter;
+  
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return false;  
+  }
+  
   //Now check if the file has already entries, and ask the user if he wants to delete them first.
 	OContactAccess::List contactList = access->allRecords();
   if (contactList.count() > 0)
   {
     QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
     if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
       // Clean the database..
       access->clear();
     }
   }
   
-  KABC::OpieConverter mConverter;
-  bool res;
       
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     OContact c;
     KABC::Addressee addressee = (*it);
     
     res = mConverter.addresseeToOpie( *it, c );
     if (res == true)
     {
       res = access->add(c);
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
diff --git a/kaddressbook/xxport/opie/opie_xxportE.pro b/kaddressbook/xxport/opie/opie_xxportE.pro
index a660a48..c373e37 100644
--- a/kaddressbook/xxport/opie/opie_xxportE.pro
+++ b/kaddressbook/xxport/opie/opie_xxportE.pro
@@ -1,24 +1,25 @@
 TEMPLATE = lib
 CONFIG += qt warn_on 
 TARGET = kaddrbk_opie_xxport
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 
 DEFINES += KAB_EMBEDDED
 
-INCLUDEPATH += ../.. ../../..  ../../../kabc ../../../kabc/converter/opie ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../..  ../../../kabc ../../../kabc/converter/opie ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(OPIEDIR)/include
 LIBS += -L$(QPEDIR)/lib
+LIBS += -L$(OPIEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lmicrokabc_opieconverter
 
 INTERFACES = \
 
 HEADERS = \
   opie_xxport.h \