|
Lines 217-223
Link Here
|
| 217 |
#if defined(KABC_VCARD_ENCODING_FIX) |
217 |
#if defined(KABC_VCARD_ENCODING_FIX) |
| 218 |
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
218 |
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
| 219 |
#else |
219 |
#else |
| 220 |
TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); |
220 |
TQTextStream s( &file ); |
|
|
221 |
s.setEncoding( TQTextStream::UnicodeUTF8 ); |
| 222 |
TDEABC::Addressee::List list = converter.parseVCards( s.read() ); |
| 221 |
#endif |
223 |
#endif |
| 222 |
TDEABC::Addressee::List::Iterator it; |
224 |
TDEABC::Addressee::List::Iterator it; |
| 223 |
|
225 |
|
|
Lines 271-277
Link Here
|
| 271 |
#if defined(KABC_VCARD_ENCODING_FIX) |
273 |
#if defined(KABC_VCARD_ENCODING_FIX) |
| 272 |
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
274 |
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
| 273 |
#else |
275 |
#else |
| 274 |
TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); |
276 |
TQTextStream s( &file ); |
|
|
277 |
s.setEncoding( TQTextStream::UnicodeUTF8 ); |
| 278 |
TDEABC::Addressee::List list = converter.parseVCards( s.read() ); |
| 275 |
#endif |
279 |
#endif |
| 276 |
TDEABC::Addressee::List::Iterator cacheIt; |
280 |
TDEABC::Addressee::List::Iterator cacheIt; |
| 277 |
TDEABC::Addressee::List::ConstIterator it; |
281 |
TDEABC::Addressee::List::ConstIterator it; |
|
Lines 393-399
Link Here
|
| 393 |
#if defined(KABC_VCARD_ENCODING_FIX) |
397 |
#if defined(KABC_VCARD_ENCODING_FIX) |
| 394 |
const TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
398 |
const TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); |
| 395 |
#else |
399 |
#else |
| 396 |
const TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); |
400 |
TQTextStream s( &file ); |
|
|
401 |
s.setEncoding( TQTextStream::UnicodeUTF8 ); |
| 402 |
const TDEABC::Addressee::List list = converter.parseVCards( s.read() ); |
| 397 |
#endif |
403 |
#endif |
| 398 |
TDEABC::Addressee::List::ConstIterator it; |
404 |
TDEABC::Addressee::List::ConstIterator it; |
| 399 |
for ( it = list.begin(); it != list.end(); ++it ) |
405 |
for ( it = list.begin(); it != list.end(); ++it ) |