From bfb2947510c52f9c6b35c35786490f261adf30e3 Mon Sep 17 00:00:00 2001 From: zautrix Date: Tue, 18 Jan 2005 22:46:53 +0000 Subject: another fix --- (limited to 'kaddressbook') diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index acf6419..c56be8b 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -1,35 +1,36 @@ /* - This file is part of KAddressbook. - Copyright (c) 2003 Tobias Koenig - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + This file is part of KAddressbook. + Copyright (c) 2003 Tobias Koenig + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. */ /* -Enhanced Version of the file for platform independent KDE tools. -Copyright (c) 2004 Ulf Schenk + Enhanced Version of the file for platform independent KDE tools. + Copyright (c) 2004 Ulf Schenk -$Id$ + $Id$ */ #include #include +#include #include #include @@ -51,10 +52,10 @@ $Id$ class VCardXXPortFactory : public XXPortFactory { - public: +public: XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) { - return new VCardXXPort( ab, parent, name ); + return new VCardXXPort( ab, parent, name ); } }; #endif //KAB_EMBEDDED @@ -63,191 +64,189 @@ class VCardXXPortFactory : public XXPortFactory extern "C" { #ifndef KAB_EMBEDDED - void *init_libkaddrbk_vcard_xxport() + void *init_libkaddrbk_vcard_xxport() #else //KAB_EMBEDDED - void *init_microkaddrbk_vcard_xxport() + void *init_microkaddrbk_vcard_xxport() #endif //KAB_EMBEDDED - { - return ( new VCardXXPortFactory() ); - } + { + return ( new VCardXXPortFactory() ); + } } VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name ) - : XXPortObject( ab, parent, name ) + : XXPortObject( ab, parent, name ) { - createImportAction( i18n( "Import vCard..." ) ); -//US KABC::VCardConverter does not support the export of 2.1 addressbooks. -//US createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); - createExportAction( i18n( "Export vCard 3.0..." ), "v30" ); + createImportAction( i18n( "Import vCard..." ) ); + //US KABC::VCardConverter does not support the export of 2.1 addressbooks. + //US createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); + createExportAction( i18n( "Export vCard 3.0..." ), "v30" ); } bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) { - QString name; + QString name; - if ( list.count() == 1 ) - name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; - else - name = "addressbook.vcf"; + if ( list.count() == 1 ) + name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; + else + name = "addressbook.vcf"; #ifndef KAB_EMBEDDED - QString fileName = KFileDialog::getSaveFileName( name ); + QString fileName = KFileDialog::getSaveFileName( name ); #else //KAB_EMBEDDED - QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); + QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); #endif //KAB_EMBEDDED - if ( fileName.isEmpty() ) - return false; + if ( fileName.isEmpty() ) + return false; - QFile outFile( fileName ); - if ( !outFile.open( IO_WriteOnly ) ) { - QString text = i18n( "Unable to open file %1 for export." ); - KMessageBox::error( parentWidget(), text.arg( fileName ) ); - return false; - } + QFile outFile( fileName ); + if ( !outFile.open( IO_WriteOnly ) ) { + QString text = i18n( "Unable to open file %1 for export." ); + KMessageBox::error( parentWidget(), text.arg( fileName ) ); + return false; + } - QTextStream t( &outFile ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + QTextStream t( &outFile ); + t.setEncoding( QTextStream::UnicodeUTF8 ); - KABC::Addressee::List::ConstIterator it; - for ( it = list.begin(); it != list.end(); ++it ) { - KABC::VCardConverter converter; - QString vcard; + KABC::Addressee::List::ConstIterator it; + for ( it = list.begin(); it != list.end(); ++it ) { + KABC::VCardConverter converter; + QString vcard; - KABC::VCardConverter::Version version; - if ( data == "v21" ) - version = KABC::VCardConverter::v2_1; - else - version = KABC::VCardConverter::v3_0; + KABC::VCardConverter::Version version; + if ( data == "v21" ) + version = KABC::VCardConverter::v2_1; + else + version = KABC::VCardConverter::v3_0; - converter.addresseeToVCard( *it, vcard, version ); - t << vcard << "\r\n\r\n"; - } + converter.addresseeToVCard( *it, vcard, version ); + t << vcard << "\r\n\r\n"; + } - outFile.close(); + outFile.close(); - return true; + return true; } KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const { - QString fileName; - KABC::AddresseeList addrList; - KURL url; + QString fileName; + KABC::AddresseeList addrList; + KURL url; #ifndef KAB_EMBEDDED - if ( !XXPortManager::importData.isEmpty() ) - addrList = parseVCard( XXPortManager::importData ); - else { - if ( XXPortManager::importURL.isEmpty() ) - { - url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); - } - else - url = XXPortManager::importURL; - - if ( url.isEmpty() ) - return addrList; - - QString caption( i18n( "vCard Import Failed" ) ); - if ( KIO::NetAccess::download( url, fileName ) ) { - QFile file( fileName ); - - file.open( IO_ReadOnly ); - QByteArray rawData = file.readAll(); - file.close(); - - QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); - addrList = parseVCard( data ); - - if ( !url.isLocalFile() ) - KIO::NetAccess::removeTempFile( fileName ); + if ( !XXPortManager::importData.isEmpty() ) + addrList = parseVCard( XXPortManager::importData ); + else { + if ( XXPortManager::importURL.isEmpty() ) + { + url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); + } + else + url = XXPortManager::importURL; + if ( url.isEmpty() ) + return addrList; + QString caption( i18n( "vCard Import Failed" ) ); + if ( KIO::NetAccess::download( url, fileName ) ) { + QFile file( fileName ); + + file.open( IO_ReadOnly ); + QByteArray rawData = file.readAll(); + file.close(); + + QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); + addrList = parseVCard( data ); + + if ( !url.isLocalFile() ) + KIO::NetAccess::removeTempFile( fileName ); + + } else { + QString text = i18n( "Unable to access %1." ); + KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); + } - } else { - QString text = i18n( "Unable to access %1." ); - KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); } - } - #else //KAB_EMBEDDED - if ( !XXPortManager::importData.isEmpty() ) - addrList = parseVCard( XXPortManager::importData ); - 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 ( !XXPortManager::importData.isEmpty() ) + addrList = parseVCard( XXPortManager::importData ); + else { + if ( XXPortManager::importURL.isEmpty() ) + { + fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); + + if ( fileName.isEmpty() ) + return addrList; + QFileInfo fi ( fileName ); + if ( !fi.isFile() ) + return addrList; + } + else + { + //US url = XXPortManager::importURL; + qDebug("VCardXXPort::importContacts Urls at the moment not supported"); + if ( url.isEmpty() ) + return addrList; + + } + QFile file( fileName ); + if ( file.open( IO_ReadOnly ) ) { + QByteArray rawData = file.readAll(); + file.close(); + QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); + addrList = parseVCard( data ); + } } - - - QFile file( fileName ); - - file.open( IO_ReadOnly ); - QByteArray rawData = file.readAll(); - file.close(); - - QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); - addrList = parseVCard( data ); - - } #endif //KAB_EMBEDDED - return addrList; + return addrList; } KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const { - KABC::VCardTool tool; - KABC::AddresseeList addrList; - addrList = tool.parseVCards( data ); - // LR : I switched to the code, which is in current cvs HEAD - /* - uint numVCards = data.contains( "BEGIN:VCARD", false ); - QStringList dataList = QStringList::split( "\r\n\r\n", data ); + KABC::VCardTool tool; + KABC::AddresseeList addrList; + addrList = tool.parseVCards( data ); + // LR : I switched to the code, which is in current cvs HEAD + /* + uint numVCards = data.contains( "BEGIN:VCARD", false ); + QStringList dataList = QStringList::split( "\r\n\r\n", data ); - for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { - KABC::Addressee addr; - bool ok = false; + for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { + KABC::Addressee addr; + bool ok = false; - if ( dataList[ i ].contains( "VERSION:3.0" ) ) + if ( dataList[ i ].contains( "VERSION:3.0" ) ) ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 ); - else if ( dataList[ i ].contains( "VERSION:2.1" ) ) + else if ( dataList[ i ].contains( "VERSION:2.1" ) ) ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 ); - else { + else { KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) ); continue; - } + } - if ( !addr.isEmpty() && ok ) + if ( !addr.isEmpty() && ok ) addrList.append( addr ); - else { + else { QString text = i18n( "The selected file does not include a valid vCard. " - "Please check the file and try again." ); + "Please check the file and try again." ); KMessageBox::sorry( parentWidget(), text ); + } + } + */ + if ( addrList.isEmpty() ) { + QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); + KMessageBox::sorry( parentWidget(), text ); } - } - */ - if ( addrList.isEmpty() ) { - QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); - KMessageBox::sorry( parentWidget(), text ); - } - return addrList; + return addrList; } -- cgit v0.9.0.2