diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-12-16 16:28:24 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-12-17 17:11:03 (GMT) |
| commit | 558fe9383ba0aecbec09cc411c0ebab132aac137 (patch) | |
| tree | 631a463e2fe2f6ff0a947b13456acaa4989f4c5b /src/corelib | |
| parent | 4d5029365ccc045522cb87582c2b2e1a36ed0d24 (diff) | |
| download | Qt-558fe9383ba0aecbec09cc411c0ebab132aac137.zip Qt-558fe9383ba0aecbec09cc411c0ebab132aac137.tar.gz Qt-558fe9383ba0aecbec09cc411c0ebab132aac137.tar.bz2 | |
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
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 9 |
1 files 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 |