-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index c56be8b..91df96d 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp | |||
@@ -188,28 +188,39 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
188 | return addrList; | 188 | return addrList; |
189 | } | 189 | } |
190 | else | 190 | else |
191 | { | 191 | { |
192 | //US url = XXPortManager::importURL; | 192 | //US url = XXPortManager::importURL; |
193 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 193 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
194 | if ( url.isEmpty() ) | 194 | if ( url.isEmpty() ) |
195 | return addrList; | 195 | return addrList; |
196 | 196 | ||
197 | } | 197 | } |
198 | QFile file( fileName ); | 198 | QFile file( fileName ); |
199 | if ( file.open( IO_ReadOnly ) ) { | 199 | if ( file.open( IO_ReadOnly ) ) { |
200 | QByteArray rawData = file.readAll(); | 200 | QCString rawData ( file.readAll().data(),file.size()+1); |
201 | file.close(); | 201 | file.close(); |
202 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 202 | int start = 0; |
203 | addrList = parseVCard( data ); | 203 | #ifndef DESKTOP_VERSION |
204 | while ( start < rawData.size()-2 ) { | ||
205 | if ( rawData.at( start ) == '\r' ) | ||
206 | if ( rawData.at( start+1 ) == '\n' ) | ||
207 | if ( rawData.at( start+2 ) == ' ' ) { | ||
208 | rawData.remove(start,3); | ||
209 | --start; | ||
210 | } | ||
211 | ++start; | ||
212 | } | ||
213 | #endif | ||
214 | addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); | ||
204 | } | 215 | } |
205 | 216 | ||
206 | } | 217 | } |
207 | #endif //KAB_EMBEDDED | 218 | #endif //KAB_EMBEDDED |
208 | 219 | ||
209 | return addrList; | 220 | return addrList; |
210 | } | 221 | } |
211 | 222 | ||
212 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | 223 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const |
213 | { | 224 | { |
214 | 225 | ||
215 | KABC::VCardTool tool; | 226 | KABC::VCardTool tool; |