Diffstat (limited to 'kaddressbook/xxport/vcard_xxport.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -33,4 +33,5 @@ $Id$ | |||
33 | 33 | ||
34 | #include <kabc/vcardconverter.h> | 34 | #include <kabc/vcardconverter.h> |
35 | #include <kabc/vcardparser/vcardtool.h> | ||
35 | #include <kfiledialog.h> | 36 | #include <kfiledialog.h> |
36 | #ifndef KAB_EMBEDDED | 37 | #ifndef KAB_EMBEDDED |
@@ -210,8 +211,11 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
210 | 211 | ||
211 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | 212 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const |
212 | { | 213 | { |
213 | KABC::VCardConverter converter; | 214 | |
215 | KABC::VCardTool tool; | ||
214 | KABC::AddresseeList addrList; | 216 | KABC::AddresseeList addrList; |
215 | 217 | addrList = tool.parseVCards( data ); | |
218 | // LR : I switched to the code, which is in current cvs HEAD | ||
219 | /* | ||
216 | uint numVCards = data.contains( "BEGIN:VCARD", false ); | 220 | uint numVCards = data.contains( "BEGIN:VCARD", false ); |
217 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); | 221 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); |
@@ -238,5 +242,9 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | |||
238 | } | 242 | } |
239 | } | 243 | } |
240 | 244 | */ | |
245 | if ( addrList.isEmpty() ) { | ||
246 | QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); | ||
247 | KMessageBox::sorry( parentWidget(), text ); | ||
248 | } | ||
241 | return addrList; | 249 | return addrList; |
242 | } | 250 | } |