| -rw-r--r-- | kaddressbook/xxport/csv_xxport.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 54 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 30 |
3 files changed, 45 insertions, 45 deletions
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index caee66d..d4d5475 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -116,3 +116,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& } - + #else //KAB_EMBEDDED @@ -122,3 +122,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& if ( fileName.isEmpty() ) - return true; + return false; @@ -138,3 +138,3 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& #endif //KAB_EMBEDDED - + } diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index db30d34..c9b0163 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp @@ -90,3 +90,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; - + #ifndef KAB_EMBEDDED @@ -96,5 +96,5 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString #endif //KAB_EMBEDDED - + if ( fileName.isEmpty() ) - return true; + return false; @@ -102,3 +102,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); - + if ( !access ) { @@ -110,3 +110,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString KABC::OpieConverter mConverter; - + bool res = mConverter.init(); @@ -118,5 +118,5 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString delete access; - return false; + return false; } - + //Now check if the file has already entries, and ask the user if he wants to delete them first. @@ -131,4 +131,4 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString } - - + + KABC::Addressee::List::ConstIterator it; @@ -137,3 +137,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString KABC::Addressee addressee = (*it); - + res = mConverter.addresseeToOpie( *it, c ); @@ -150,3 +150,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString } - + access->save(); @@ -155,3 +155,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString //US the deletion of the access object deletes the backend object as well. - + return true; @@ -162,5 +162,5 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const KABC::AddresseeList adrlst; - + QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; - + #ifndef KAB_EMBEDDED @@ -170,3 +170,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const #endif //KAB_EMBEDDED - + if ( fileName.isEmpty() ) @@ -176,3 +176,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); - + if ( !access ) { @@ -184,3 +184,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available - + KABC::OpieConverter mConverter; @@ -196,4 +196,4 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const } - - + + OContactAccess::List::Iterator it; @@ -203,7 +203,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const OContact c = (*it); - + KABC::Addressee addressee; - - res = mConverter.opieToAddressee( c, addressee ); - + + res = mConverter.opieToAddressee( c, addressee ); + if ( !addressee.isEmpty() && res ) { @@ -211,11 +211,11 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const } - + // qDebug("found %s", c.fullName().latin1()); } - + delete access; //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 adf47cd..4819341 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -92,3 +92,3 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString name = "addressbook.vcf"; - + #ifndef KAB_EMBEDDED @@ -98,5 +98,5 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString #endif //KAB_EMBEDDED - + if ( fileName.isEmpty() ) - return true; + return false; @@ -170,9 +170,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const } - + } - + #else //KAB_EMBEDDED - - + + if ( !XXPortManager::importData.isEmpty() ) @@ -185,3 +185,3 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const return addrList; - + } @@ -193,6 +193,6 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const return addrList; - + } - + QFile file( fileName ); @@ -205,6 +205,6 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const addrList = parseVCard( data ); - + } -#endif //KAB_EMBEDDED - +#endif //KAB_EMBEDDED + return addrList; @@ -213,4 +213,4 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const -{ - +{ + KABC::VCardTool tool; |