From kde-commits  Thu Jun 02 11:40:54 2005
From: Till Adam <adam () kde ! org>
Date: Thu, 02 Jun 2005 11:40:54 +0000
To: kde-commits
Subject: KDE/kdepim/kresources/kolab/shared
Message-Id: <1117712454.248682.21913.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111771247023829

SVN commit 421161 by tilladam:

This should be fixed properly now by setting the charset parameter of the
body part content type headers.


 M  +1 -5      kolabbase.cpp  


--- trunk/KDE/kdepim/kresources/kolab/shared/kolabbase.cpp #421160:421161
@@ -328,14 +328,10 @@
 
 bool KolabBase::load( const QString& xml )
 {
-  // This QString is actually in utf-8, but that fails loading in the
-  // XML engine, since it won't detect encoding in a QString. So we do this:
-  const QString utf8 = QString::fromUtf8( xml.local8Bit() );
-
   QString errorMsg;
   int errorLine, errorColumn;
   QDomDocument document;
-  bool ok = document.setContent( utf8, &errorMsg, &errorLine, &errorColumn );
+  bool ok = document.setContent( xml, &errorMsg, &errorLine, &errorColumn );
 
   if ( !ok ) {
     qWarning( "Error loading document: %s, line %d, column %d",