bugfix: choosen filenames where not used while import/export and for resources

1 files changed, 9 insertions, 3 deletions

diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index 90d05cd..f30a205 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -25,24 +25,26 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qdir.h>
 
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
 #include <opie/ocontactaccess.h>
+#include <opie/ocontactaccessbackend_xml.h>
+
 #include "stdaddressbook.h"
 
 /*US
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <kabc/vcardconverter.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
@@ -87,25 +89,26 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
 {
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
     
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
   
   if ( fileName.isEmpty() )
     return true;
 
-  OContactAccess* access = new OContactAccess("KA/Pi", fileName, 0l, false);
+  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;
   }
 
   //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.?" ) );
@@ -130,44 +133,46 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
   
   access->save();
 
   delete access;
-    
+  delete backend;
+      
   return true;
 }
 
 KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
   
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
     
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() );
 #endif //KAB_EMBEDDED
   
   if ( fileName.isEmpty() )
     return KABC::AddresseeList();
 
-  OContactAccess* access = new OContactAccess("KA/Pi", fileName, 0l, false);
+  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 KABC::AddresseeList();
   }
 
   access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
   
   KABC::OpieConverter mConverter;
   bool res = false;
 
@@ -181,16 +186,17 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
     KABC::Addressee addressee;
     
     res = mConverter.opieToAddressee( c, addressee );    
     
     if ( !addressee.isEmpty() && res ) {
       adrlst.append( addressee );
     }
     
 //    qDebug("found %s", c.fullName().latin1());
   }
   
   delete access;
+  delete backend;
   
   return adrlst;
   
 }