Diffstat (limited to 'kaddressbook/addresseeutil.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/addresseeutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp index 366384a..a860f6d 100644 --- a/kaddressbook/addresseeutil.cpp +++ b/kaddressbook/addresseeutil.cpp | |||
@@ -25,42 +25,42 @@ | |||
25 | #include <kabc/vcardconverter.h> | 25 | #include <kabc/vcardconverter.h> |
26 | #include <kdebug.h> | 26 | #include <kdebug.h> |
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kmessagebox.h> | 28 | #include <kmessagebox.h> |
29 | 29 | ||
30 | #include "addresseeutil.h" | 30 | #include "addresseeutil.h" |
31 | 31 | ||
32 | QString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list ) | 32 | QString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list ) |
33 | { | 33 | { |
34 | KABC::VCardConverter converter; | 34 | KABC::VCardConverter converter; |
35 | QString vcard; | 35 | QString vcard; |
36 | 36 | ||
37 | KABC::Addressee::List::ConstIterator it; | 37 | KABC::Addressee::List::ConstIterator it; |
38 | for ( it = list.begin(); it != list.end(); ++it ) { | 38 | for ( it = list.begin(); it != list.end(); ++it ) { |
39 | QString tmp; | 39 | QString tmp; |
40 | if ( converter.addresseeToVCard( *it, tmp ) ) | 40 | if ( converter.addresseeToVCard( *it, tmp ) ) |
41 | vcard += tmp + "\r\n"; | 41 | vcard += tmp + "\r\n"; |
42 | } | 42 | } |
43 | 43 | ||
44 | return vcard; | 44 | return vcard; |
45 | } | 45 | } |
46 | 46 | ||
47 | KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const QString &data ) | 47 | KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const QString &data ) |
48 | { | 48 | { |
49 | uint numVCards = data.contains( "BEGIN:VCARD", false ); | 49 | uint numVCards = data.count( "BEGIN:VCARD", Qt::CaseInsensitive ); |
50 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); | 50 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); |
51 | 51 | ||
52 | KABC::Addressee::List addrList; | 52 | KABC::Addressee::List addrList; |
53 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { | 53 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { |
54 | KABC::VCardConverter converter; | 54 | KABC::VCardConverter converter; |
55 | KABC::Addressee addr; | 55 | KABC::Addressee addr; |
56 | 56 | ||
57 | if ( !converter.vCardToAddressee( dataList[ i ].stripWhiteSpace(), addr ) ) { | 57 | if ( !converter.vCardToAddressee( dataList[ i ].stripWhiteSpace(), addr ) ) { |
58 | KMessageBox::error( 0, i18n( "Invalid vCard format in clipboard" ) ); | 58 | KMessageBox::error( 0, i18n( "Invalid vCard format in clipboard" ) ); |
59 | continue; | 59 | continue; |
60 | } | 60 | } |
61 | 61 | ||
62 | addrList.append( addr ); | 62 | addrList.append( addr ); |
63 | } | 63 | } |
64 | 64 | ||
65 | return addrList; | 65 | return addrList; |
66 | } | 66 | } |