summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-06 19:02:07 (UTC)
committer zautrix <zautrix>2004-07-06 19:02:07 (UTC)
commit9c1abdb6194f9539b26d9f3045bde5cd91960dd0 (patch) (unidiff)
treea43c34fa6d16aefb7f8b62c81cea1adce4cd056d
parent0e4c0997605662222e0c898277de7ef26bd0a0eb (diff)
downloadkdepimpi-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
Diffstat (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$
29*/ 29*/
30 30
31#include <qfile.h> 31#include <qfile.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
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
37#include <kio/netaccess.h> 38#include <kio/netaccess.h>
38#endif //KAB_EMBEDDED 39#endif //KAB_EMBEDDED
39 40
40#include <klocale.h> 41#include <klocale.h>
@@ -206,16 +207,19 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
206#endif //KAB_EMBEDDED 207#endif //KAB_EMBEDDED
207 208
208 return addrList; 209 return addrList;
209} 210}
210 211
211KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const 212KABC::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 );
218 222
219 for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { 223 for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
220 KABC::Addressee addr; 224 KABC::Addressee addr;
221 bool ok = false; 225 bool ok = false;
@@ -234,13 +238,17 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
234 else { 238 else {
235 QString text = i18n( "The selected file does not include a valid vCard. " 239 QString text = i18n( "The selected file does not include a valid vCard. "
236 "Please check the file and try again." ); 240 "Please check the file and try again." );
237 KMessageBox::sorry( parentWidget(), text ); 241 KMessageBox::sorry( parentWidget(), text );
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}
243 251
244#ifndef KAB_EMBEDDED 252#ifndef KAB_EMBEDDED
245#include "vcard_xxport.moc" 253#include "vcard_xxport.moc"
246#endif //KAB_EMBEDDED 254#endif //KAB_EMBEDDED