| -rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index f30a205..d1def18 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp @@ -141,9 +141,9 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString access->save(); delete access; - delete backend; +//US the deletion of the access object deletes the backend object as well. return true; } @@ -194,9 +194,9 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const // qDebug("found %s", c.fullName().latin1()); } delete access; - delete backend; +//US the deletion of the access object deletes the backend object as well. return adrlst; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index c017f5b..54d0cbd 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -178,17 +178,21 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const else { if ( XXPortManager::importURL.isEmpty() ) { fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); + if ( fileName.isEmpty() ) + return addrList; + } else { //US url = XXPortManager::importURL; qDebug("VCardXXPort::importContacts Urls at the moment not supported"); + if ( url.isEmpty() ) + return addrList; + } - if ( url.isEmpty() ) - return addrList; QFile file( fileName ); file.open( IO_ReadOnly ); |