From c60e2450ccd1002546970ae1dfcb841f98b6bc52 Mon Sep 17 00:00:00 2001 From: Matthew Horan Date: Sun, 6 Jan 2013 21:59:07 -0500 Subject: [PATCH] Replace QString::toAscii with QString::toLatin1 QString::toAscii removed in Qt 5. --- src/CommandParser.cpp | 2 +- src/Connection.cpp | 2 +- src/NetworkAccessManager.cpp | 2 +- src/SetCookie.cpp | 2 +- src/WebPage.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CommandParser.cpp b/src/CommandParser.cpp index 14308fa..e31c78f 100644 --- a/src/CommandParser.cpp +++ b/src/CommandParser.cpp @@ -63,7 +63,7 @@ void CommandParser::processArgument(const char *data) { } if (m_arguments.length() == m_argumentsExpected) { - Command *command = m_commandFactory->createCommand(m_commandName.toAscii().constData(), m_arguments); + Command *command = m_commandFactory->createCommand(m_commandName.toLatin1().constData(), m_arguments); emit commandReady(command); reset(); } diff --git a/src/Connection.cpp b/src/Connection.cpp index 5a87fdc..dc33139 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -64,7 +64,7 @@ void Connection::writeResponse(Response *response) { QByteArray messageUtf8 = response->message(); QString messageLength = QString::number(messageUtf8.size()) + "\n"; - m_socket->write(messageLength.toAscii()); + m_socket->write(messageLength.toLatin1()); m_socket->write(messageUtf8); } diff --git a/src/NetworkAccessManager.cpp b/src/NetworkAccessManager.cpp index 438aae0..fda88ce 100644 --- a/src/NetworkAccessManager.cpp +++ b/src/NetworkAccessManager.cpp @@ -21,7 +21,7 @@ QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operat QHashIterator item(m_headers); while (item.hasNext()) { item.next(); - new_request.setRawHeader(item.key().toAscii(), item.value().toAscii()); + new_request.setRawHeader(item.key().toLatin1(), item.value().toLatin1()); } QNetworkReply *reply = QNetworkAccessManager::createRequest(operation, new_request, outgoingData); emit requestCreated(url, reply); diff --git a/src/SetCookie.cpp b/src/SetCookie.cpp index 9f08572..a210ab1 100644 --- a/src/SetCookie.cpp +++ b/src/SetCookie.cpp @@ -8,7 +8,7 @@ SetCookie::SetCookie(WebPageManager *manager, QStringList &arguments, QObject *p void SetCookie::start() { - QList cookies = QNetworkCookie::parseCookies(arguments()[0].toAscii()); + QList cookies = QNetworkCookie::parseCookies(arguments()[0].toLatin1()); NetworkCookieJar *jar = manager()->cookieJar(); jar->overwriteCookies(cookies); finish(true); diff --git a/src/WebPage.cpp b/src/WebPage.cpp index eee3a56..ce35689 100644 --- a/src/WebPage.cpp +++ b/src/WebPage.cpp @@ -125,7 +125,7 @@ InvocationResult WebPage::invokeCapybaraFunction(const char *name, const QString } InvocationResult WebPage::invokeCapybaraFunction(QString &name, const QStringList &arguments) { - return invokeCapybaraFunction(name.toAscii().data(), arguments); + return invokeCapybaraFunction(name.toLatin1().data(), arguments); } void WebPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) {