summaryrefslogtreecommitdiffabout
path: root/kaddressbook
Side-by-side diff
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp16
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
@@ -29,12 +29,13 @@ $Id$
*/
#include <qfile.h>
#include <qtextstream.h>
#include <kabc/vcardconverter.h>
+#include <kabc/vcardparser/vcardtool.h>
#include <kfiledialog.h>
#ifndef KAB_EMBEDDED
#include <kio/netaccess.h>
#endif //KAB_EMBEDDED
#include <klocale.h>
@@ -206,16 +207,19 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
#endif //KAB_EMBEDDED
return addrList;
}
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 );
for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
KABC::Addressee addr;
bool ok = false;
@@ -234,13 +238,17 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
else {
QString text = i18n( "The selected file does not include a valid vCard. "
"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 );
+ }
return addrList;
}
#ifndef KAB_EMBEDDED
#include "vcard_xxport.moc"
#endif //KAB_EMBEDDED