TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix utf8 handling in tdeabc resource cache

Browse Source 
This relates to bug 2625

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/21/head
Slávek Banko 9 years ago
parent 5b9cd454fb
commit 85a02f7b0d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File

12
libtdepim/tdeabcresourcecached.cpp
Unescape View File

@ -217,7 +217,9 @@ void ResourceCached::loadCache()
#if defined(KABC_VCARD_ENCODING_FIX) #if defined(KABC_VCARD_ENCODING_FIX)
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
#else #else
TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); TQTextStream s( &file );
s.setEncoding( TQTextStream::UnicodeUTF8 );
TDEABC::Addressee::List list = converter.parseVCards( s.read() );
#endif #endif
TDEABC::Addressee::List::Iterator it; TDEABC::Addressee::List::Iterator it;
@ -271,7 +273,9 @@ void ResourceCached::cleanUpCache( const TDEABC::Addressee::List &addrList )
#if defined(KABC_VCARD_ENCODING_FIX) #if defined(KABC_VCARD_ENCODING_FIX)
TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
#else #else
TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); TQTextStream s( &file );
s.setEncoding( TQTextStream::UnicodeUTF8 );
TDEABC::Addressee::List list = converter.parseVCards( s.read() );
#endif #endif
TDEABC::Addressee::List::Iterator cacheIt; TDEABC::Addressee::List::Iterator cacheIt;
TDEABC::Addressee::List::ConstIterator it; TDEABC::Addressee::List::ConstIterator it;
@ -393,7 +397,9 @@ void ResourceCached::loadChangesCache( TQMap<TQString, TDEABC::Addressee> &map,
#if defined(KABC_VCARD_ENCODING_FIX) #if defined(KABC_VCARD_ENCODING_FIX)
const TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); const TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
#else #else
const TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); TQTextStream s( &file );
s.setEncoding( TQTextStream::UnicodeUTF8 );
const TDEABC::Addressee::List list = converter.parseVCards( s.read() );
#endif #endif
TDEABC::Addressee::List::ConstIterator it; TDEABC::Addressee::List::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) for ( it = list.begin(); it != list.end(); ++it )

Write Preview
Loading…
Cancel
Save