summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-01-18 14:13:43 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-18 14:13:43 +0100
commit5a692370051844e966a42abcfc48beae75112539 (patch)
tree27d440e95022da3cc7f3a67c49a3eed5c344e4fc /libtdepim
parentb415f1f1f41873febdad7448ad04648a148b1ad5 (diff)
downloadtdepim-5a692370051844e966a42abcfc48beae75112539.tar.gz
tdepim-5a692370051844e966a42abcfc48beae75112539.zip
Fix utf8 and html entities handling in CalDAV and CardDAV resources
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/tdeabcresourcecached.cpp6
1 files changed, 3 insertions, 3 deletions
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<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( 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 )