Fix utf8 handling in libkcal/icalformat

This resolves bug 2660

Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
pull/21/head
Emanoil Kotsev 8 years ago committed by Slávek Banko
parent 105df0826e
commit 63c4d2db47

@ -88,14 +88,14 @@ bool ICalFormat::load( Calendar *calendar, const TQString &fileName)
return false;
}
TQTextStream ts( &file );
ts.setEncoding( TQTextStream::Latin1 );
ts.setEncoding( TQTextStream::UnicodeUTF8 );
TQString 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,6 +123,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName )
// Convert to UTF8 and save
TQCString textUtf8 = text.utf8();
file.textStream()->setEncoding( TQTextStream::UnicodeUTF8 );
file.file()->writeBlock(textUtf8.data(),textUtf8.size()-1);
if ( !file.close() ) {

Loading…
Cancel
Save