summaryrefslogtreecommitdiffstats
path: root/libkdepim/kabcresourcecached.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkdepim/kabcresourcecached.cpp')
-rw-r--r--libkdepim/kabcresourcecached.cpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp
index 26648e762..d46156f6d 100644
--- a/libkdepim/kabcresourcecached.cpp
+++ b/libkdepim/kabcresourcecached.cpp
@@ -214,7 +214,11 @@ void ResourceCached::loadCache()
KABC::VCardConverter converter;
+#if defined(KABC_VCARD_ENCODING_FIX)
+ KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
+#else
KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) );
+#endif
KABC::Addressee::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
@@ -239,8 +243,13 @@ void ResourceCached::saveCache()
KABC::Addressee::List list = mAddrMap.values();
KABC::VCardConverter converter;
+#if defined(KABC_VCARD_ENCODING_FIX)
+ TQCString vCard = converter.createVCardsRaw( list );
+ file.writeBlock( vCard, vCard.length() );
+#else
TQString vCard = converter.createVCards( list );
file.writeBlock( vCard.utf8(), vCard.utf8().length() );
+#endif
file.close();
}
@@ -259,7 +268,11 @@ void ResourceCached::cleanUpCache( const KABC::Addressee::List &addrList )
KABC::VCardConverter converter;
+#if defined(KABC_VCARD_ENCODING_FIX)
+ KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
+#else
KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) );
+#endif
KABC::Addressee::List::Iterator cacheIt;
KABC::Addressee::List::ConstIterator it;
@@ -351,9 +364,14 @@ void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &m
}
KABC::VCardConverter converter;
+#if defined(KABC_VCARD_ENCODING_FIX)
+ const TQCString vCards = converter.createVCardsRaw( list );
+ file.writeBlock( vCards, vCards.length() );
+#else
const TQString vCards = converter.createVCards( list );
TQCString content = vCards.utf8();
file.writeBlock( content, content.length() );
+#endif
}
}
@@ -372,7 +390,11 @@ void ResourceCached::loadChangesCache( TQMap<TQString, KABC::Addressee> &map, co
KABC::VCardConverter converter;
+#if defined(KABC_VCARD_ENCODING_FIX)
+ const KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() );
+#else
const KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) );
+#endif
KABC::Addressee::List::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it )
map.insert( (*it).uid(), *it );