Diffstat (limited to 'kaddressbook/xxport/vcard_xxport.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index adf47cd..4819341 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -91,5 +91,5 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString else name = "addressbook.vcf"; - + #ifndef KAB_EMBEDDED QString fileName = KFileDialog::getSaveFileName( name ); @@ -97,7 +97,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); #endif //KAB_EMBEDDED - + if ( fileName.isEmpty() ) - return true; + return false; QFile outFile( fileName ); @@ -169,11 +169,11 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); } - + } - + #else //KAB_EMBEDDED - - + + if ( !XXPortManager::importData.isEmpty() ) addrList = parseVCard( XXPortManager::importData ); @@ -184,5 +184,5 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const if ( fileName.isEmpty() ) return addrList; - + } else @@ -192,8 +192,8 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const if ( url.isEmpty() ) return addrList; - + } - + QFile file( fileName ); @@ -204,14 +204,14 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); addrList = parseVCard( data ); - + } -#endif //KAB_EMBEDDED - +#endif //KAB_EMBEDDED + return addrList; } KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const -{ - +{ + KABC::VCardTool tool; KABC::AddresseeList addrList; |