File kdepim-trinity-kcal-utf8.patch of Package kdepim3

Overview Repositories Revisions Requests Users Attributes Meta

File kdepim-trinity-kcal-utf8.patch of Package kdepim3 (Revision 93d2328d0d99317ff0170821a1b5ca95)

Currently displaying revision 93d2328d0d99317ff0170821a1b5ca95 , Show latest

From 63c4d2db479e17f91e61616fd736185277524d89 Mon Sep 17 00:00:00 2001
From: Emanoil Kotsev <deloptes@gmail.com>
Date: Wed, 12 Oct 2016 22:42:20 +0200
Subject: Fix utf8 handling in libkcal/icalformat This resolves bug 2660

Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
---
 libkcal/icalformat.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 34a4a1a..52f4777 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -88,14 +88,14 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
     return false;
   }
   QTextStream ts( &file );
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( QTextStream::UnicodeUTF8 );
   QString text = ts.read();
   file.close();
 
   if ( text.stripWhiteSpace().isEmpty() ) // empty files are valid
     return true;
   else
-    return fromRawString( calendar, text.latin1() );
+    return fromRawString( calendar, text.utf8() );
 }
 
 
@@ -123,7 +123,8 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
 
   // Convert to UTF8 and save
   QCString textUtf8 = text.utf8();
-  file.file()->writeBlock( textUtf8.data(), textUtf8.size() - 1 );
+  file.textStream()->setEncoding( QTextStream::UnicodeUTF8 );
+  file.file()->writeBlock(textUtf8.data(),textUtf8.size()-1);
 
   if ( !file.close() ) {
     kdDebug(5800) << "KSaveFile: close: status was " << file.status() << ". See errno.h." << endl;
-- 
cgit v1.1

Places

File kdepim-trinity-kcal-utf8.patch of Package kdepim3 (Revision 93d2328d0d99317ff0170821a1b5ca95)

Places