| author | zautrix <zautrix> | 2004-07-06 19:02:07 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-07-06 19:02:07 (UTC) |
| commit | 9c1abdb6194f9539b26d9f3045bde5cd91960dd0 (patch) (side-by-side diff) | |
| tree | a43c34fa6d16aefb7f8b62c81cea1adce4cd056d /kaddressbook | |
| parent | 0e4c0997605662222e0c898277de7ef26bd0a0eb (diff) | |
| download | kdepimpi-9c1abdb6194f9539b26d9f3045bde5cd91960dd0.zip kdepimpi-9c1abdb6194f9539b26d9f3045bde5cd91960dd0.tar.gz kdepimpi-9c1abdb6194f9539b26d9f3045bde5cd91960dd0.tar.bz2 | |
Switched to the way importing of vcards is done in current cvs HEAD of KDE
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 14 |
1 files changed, 11 insertions, 3 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 @@ -34,2 +34,3 @@ $Id$ #include <kabc/vcardconverter.h> +#include <kabc/vcardparser/vcardtool.h> #include <kfiledialog.h> @@ -212,5 +213,8 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const { - KABC::VCardConverter converter; - KABC::AddresseeList addrList; + 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 ); @@ -239,3 +243,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const } - + */ + 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; |