From 558fe9383ba0aecbec09cc411c0ebab132aac137 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 16 Dec 2010 17:28:24 +0100
Subject: make QXmlStreamWriterPrivate::write(const char *s) ascii-only

it's only ever called with ascii data, and the input encoding semantics
weren't all that clear anyway.

Reviewed-by: denis
---
 src/corelib/xml/qxmlstream.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 91c3a19..50703a4 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -3083,16 +3083,11 @@ void QXmlStreamWriterPrivate::writeEscaped(const QString &s, bool escapeWhitespa
         qWarning("QXmlStreamWriter: No device");
 }
 
-
+// ASCII only!
 void QXmlStreamWriterPrivate::write(const char *s)
 {
     if (device) {
-#ifndef QT_NO_TEXTCODEC
-        if (codec->mibEnum() != 106)
-            device->write(encoder->fromUnicode(QLatin1String(s)));
-        else
-#endif
-            device->write(s, strlen(s));
+        device->write(s, strlen(s));
     } else if (stringDevice) {
         stringDevice->append(QLatin1String(s));
     } else
-- 
cgit v0.12