| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 54d0cbd..b53f873 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -32,6 +32,7 @@ $Id$ #include <qtextstream.h> #include <kabc/vcardconverter.h> +#include <kabc/vcardparser/vcardtool.h> #include <kfiledialog.h> #ifndef KAB_EMBEDDED #include <kio/netaccess.h> @@ -209,10 +210,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const } KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const -{ - KABC::VCardConverter converter; +{ + + 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 ); @@ -237,7 +241,11 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const 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; } |