diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 16:04:23 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 16:13:55 +0000 |
| commit | 1afc99397bd35fc3cd24913f5dc10743de1833dc (patch) | |
| tree | 6dfb7914aed55e89a1bbe22c2f3b5b37a8b3a9e4 | |
| parent | 3e3f047e59db88e806b3c1fd94c4a996f5317b68 (diff) | |
Revert "Use QNetworkReply::networkError() instead of simple error()"v5.15.0-beta2
This reverts commit ce84933d7466a6eb966da03591f6b45fbc0dcb47.
QProcess takes precedence.
Naming in QProcess is considered to be the correct one.
Change-Id: Ie54f27c31ac0753a54632be1fa37280016ebb671
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
| -rw-r--r-- | examples/oauth/redditclient/redditmodel.cpp | 2 | ||||
| -rw-r--r-- | examples/oauth/redditclient/redditwrapper.cpp | 2 | ||||
| -rw-r--r-- | src/oauth/qoauthoobreplyhandler.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/oauth/redditclient/redditmodel.cpp b/examples/oauth/redditclient/redditmodel.cpp index bdbab0a..a415e04 100644 --- a/examples/oauth/redditclient/redditmodel.cpp +++ b/examples/oauth/redditclient/redditmodel.cpp @@ -101,7 +101,7 @@ void RedditModel::update() connect(reply, &QNetworkReply::finished, [=]() { reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) { + if (reply->error() != QNetworkReply::NoError) { emit error(reply->errorString()); return; } diff --git a/examples/oauth/redditclient/redditwrapper.cpp b/examples/oauth/redditclient/redditwrapper.cpp index 95cd05f..105f670 100644 --- a/examples/oauth/redditclient/redditwrapper.cpp +++ b/examples/oauth/redditclient/redditwrapper.cpp @@ -112,7 +112,7 @@ void RedditWrapper::subscribeToLiveUpdates() QNetworkReply *reply = oauth2.get(liveThreadsUrl); connect(reply, &QNetworkReply::finished, [=]() { reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) { + if (reply->error() != QNetworkReply::NoError) { qCritical() << "Reddit error:" << reply->errorString(); return; } diff --git a/src/oauth/qoauthoobreplyhandler.cpp b/src/oauth/qoauthoobreplyhandler.cpp index b04c33c..0409274 100644 --- a/src/oauth/qoauthoobreplyhandler.cpp +++ b/src/oauth/qoauthoobreplyhandler.cpp @@ -52,7 +52,7 @@ QString QOAuthOobReplyHandler::callback() const void QOAuthOobReplyHandler::networkReplyFinished(QNetworkReply *reply) { - if (reply->networkError() != QNetworkReply::NoError) { + if (reply->error() != QNetworkReply::NoError) { qCWarning(lcReplyHandler, "%s", qPrintable(reply->errorString())); return; } |