Fix utf8 handling in tdeabc resource cache

This relates to bug 2625

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 85a02f7b0d)

libtdepim/tdeabcresourcecached.cpp

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