diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 11:33:05 +0200 |
commit | 5e2590b537a6896c8a15ffcbd898c06b8b4ddfcf (patch) | |
tree | 1099801a10952f7516dad1e012027e9dec73320c | |
parent | afbdf3b1ccd6c530eebafe447d590f2cb76ffd6f (diff) |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtXml]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: I7e7202e6a1a84699ae0d43e4b2e7ee9ec87ed0b6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r-- | src/xml/sax/qxml.cpp | 2 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 616ceeb042..b841debd66 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -1563,7 +1563,7 @@ QString QXmlInputSource::fromRawData(const QByteArray &data, bool beginning) { #ifdef QT_NO_TEXTCODEC Q_UNUSED(beginning); - return QString::fromAscii(data.constData(), data.size()); + return QString::fromLatin1(data.constData(), data.size()); #else if (data.size() == 0) return QString(); diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp index d8b193f5c8..2b92f7c7b6 100644 --- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp @@ -138,10 +138,10 @@ public slots: { QUrl url("http://127.0.0.1:1088"); QNetworkRequest req(url); - req.setRawHeader("POST", url.path().toAscii()); + req.setRawHeader("POST", url.path().toLatin1()); req.setRawHeader("user-agent", "xml-test"); req.setRawHeader("keep-alive", "false"); - req.setRawHeader("host", url.host().toAscii()); + req.setRawHeader("host", url.host().toLatin1()); QByteArray xmlrpc("<methodCall>\r\n\ <methodName>SFD.GetVersion</methodName>\r\n\ |