From 5a692370051844e966a42abcfc48beae75112539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 18 Jan 2014 14:13:43 +0100 Subject: Fix utf8 and html entities handling in CalDAV and CardDAV resources --- libtdepim/tdeabcresourcecached.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libtdepim') diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp index 3bb96112d..5cae5882d 100644 --- a/libtdepim/tdeabcresourcecached.cpp +++ b/libtdepim/tdeabcresourcecached.cpp @@ -217,7 +217,7 @@ 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( TQString::fromUtf8( file.readAll() ) ); + TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); #endif TDEABC::Addressee::List::Iterator it; @@ -271,7 +271,7 @@ 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( TQString::fromUtf8( file.readAll() ) ); + TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); #endif TDEABC::Addressee::List::Iterator cacheIt; TDEABC::Addressee::List::ConstIterator it; @@ -393,7 +393,7 @@ void ResourceCached::loadChangesCache( TQMap &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( TQString::fromUtf8( file.readAll() ) ); + const TDEABC::Addressee::List list = converter.parseVCards( file.readAll() ); #endif TDEABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) -- cgit v1.2.1