From 1ed1079ad84c093101a6ad97ef49635ca12f7c08 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 23 Aug 2010 09:10:28 +0200 Subject: A few tiny improvements to the QDeclarativeXMLHTTPRequest. Just make use of the new api that was added in previous commits. Reviewed-by: Olivier Goffart --- src/declarative/qml/qdeclarativexmlhttprequest.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 8c97e29..ef2798c 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -1080,10 +1080,9 @@ QString QDeclarativeXMLHttpRequest::headers() foreach (const HeaderPair &header, m_headersList) { if (ret.length()) - ret.append(QString::fromUtf8("\r\n")); - ret.append(QString::fromUtf8(header.first)); - ret.append(QString::fromUtf8(": ")); - ret.append(QString::fromUtf8(header.second)); + ret.append(QLatin1String("\r\n")); + ret = ret % QString::fromUtf8(header.first) % QLatin1String(": ") + % QString::fromUtf8(header.second); } return ret; } @@ -1095,8 +1094,8 @@ void QDeclarativeXMLHttpRequest::fillHeadersList() m_headersList.clear(); foreach (const QByteArray &header, headerList) { HeaderPair pair (header.toLower(), m_network->rawHeader(header)); - if (pair.first == "set-cookie" || - pair.first == "set-cookie2") + if (pair.first == "set-cookie" || + pair.first == "set-cookie2") continue; m_headersList << pair; @@ -1307,7 +1306,7 @@ QString QDeclarativeXMLHttpRequest::responseBody() const QXmlStreamReader reader(m_responseEntityBody); reader.readNext(); #ifndef QT_NO_TEXTCODEC - QTextCodec *codec = QTextCodec::codecForName(reader.documentEncoding().toString().toUtf8()); + QTextCodec *codec = QTextCodec::codecForName(reader.documentEncoding().toUtf8()); if (codec) return codec->toUnicode(m_responseEntityBody); #endif -- cgit v0.12