summaryrefslogtreecommitdiffabout
path: root/kaddressbook/xxport
authorulf69 <ulf69>2004-07-06 04:04:56 (UTC)
committer ulf69 <ulf69>2004-07-06 04:04:56 (UTC)
commitc4bd138c16e8d34294502c9da5706e21337ba53d (patch) (side-by-side diff)
tree08f15d9575264b04bcb0135077918175e2cd1650 /kaddressbook/xxport
parent6a826e654102e78abb6d14f80a3679575e5d3c9a (diff)
downloadkdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.zip
kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.gz
kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.bz2
ok button of dialog works now. import of vcards works now, export of opie resources too.
Diffstat (limited to 'kaddressbook/xxport') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp4
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp8
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
@@ -142,7 +142,7 @@ 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;
}
@@ -195,7 +195,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
}
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
@@ -179,15 +179,19 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
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 );