summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-05-29 02:43:02 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-05-29 02:43:14 +0200
commitfb7848bf4c4c3405a96af1372df93261b40c41bb (patch)
treecd6a4251ca55c7cebb58174fa86871d13e6cfca6
parent0eeab90efa2797795e9155b16debc4203f463c51 (diff)
downloadtdepim-fb7848bf4c4c3405a96af1372df93261b40c41bb.tar.gz
tdepim-fb7848bf4c4c3405a96af1372df93261b40c41bb.zip
Fix utf8 handling in kaddressbook thumbnailcreator
This relates to bug 2625 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fba4827c29257321c11528f8ff6567172efe2c63)
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 44e4684f8..5c0314c3c 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -80,7 +80,9 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
const TQString contents( data );
const TQCString contentsRaw( data.data(), data.size() );
#else
- TQString contents = file.readAll();
+ TQTextStream s( &file );
+ s.setEncoding( TQTextStream::UnicodeUTF8 );
+ TQString contents = s.read();
#endif
file.close();