From 80b084d9775498b266a2502f41a9214ad680a546 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 20 Nov 2016 08:02:04 +0900
Subject: [PATCH] Update qtlibs
---
src/app/handlers/xdgurl.cpp | 2 +-
src/libs/qtlibs/networkresource.cpp | 14 +++++++++++---
src/libs/qtlibs/networkresource.h | 1 +
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/app/handlers/xdgurl.cpp b/src/app/handlers/xdgurl.cpp
index fa37eeb..5080d17 100644
--- a/src/app/handlers/xdgurl.cpp
+++ b/src/app/handlers/xdgurl.cpp
@@ -77,7 +77,7 @@ void XdgUrl::openDestination()
void XdgUrl::networkResourceFinished(qtlibs::NetworkResource *resource)
{
- if (resource->reply()->error() != QNetworkReply::NoError) {
+ if (!resource->isFinishedWithNoError()) {
QJsonObject result;
result["status"] = QString("error_network");
result["message"] = resource->reply()->errorString();
diff --git a/src/libs/qtlibs/networkresource.cpp b/src/libs/qtlibs/networkresource.cpp
index 3f3c565..1745a1c 100644
--- a/src/libs/qtlibs/networkresource.cpp
+++ b/src/libs/qtlibs/networkresource.cpp
@@ -118,10 +118,18 @@ NetworkResource *NetworkResource::get()
return send(async(), networkRequest);
}
+bool NetworkResource::isFinishedWithNoError()
+{
+ if (reply()->isFinished() && reply()->error() == QNetworkReply::NoError) {
+ return true;
+ }
+ return false;
+}
+
QByteArray NetworkResource::readData()
{
QByteArray data;
- if (reply()->isFinished()) {
+ if (isFinishedWithNoError()) {
data = reply()->readAll();
}
return data;
@@ -129,7 +137,7 @@ QByteArray NetworkResource::readData()
bool NetworkResource::saveData(const QString &path)
{
- if (reply()->isFinished()) {
+ if (isFinishedWithNoError()) {
return qtlibs::File(path).writeData(reply()->readAll());
}
return false;
@@ -144,7 +152,7 @@ void NetworkResource::abort()
void NetworkResource::replyFinished()
{
- if (reply()->error() == QNetworkReply::NoError) {
+ if (isFinishedWithNoError()) {
// Check if redirection
// Note: An auto redirection option is available since Qt 5.6
QString newUrl;
diff --git a/src/libs/qtlibs/networkresource.h b/src/libs/qtlibs/networkresource.h
index 1a4c73b..0a95190 100644
--- a/src/libs/qtlibs/networkresource.h
+++ b/src/libs/qtlibs/networkresource.h
@@ -44,6 +44,7 @@ public:
NetworkResource *head();
NetworkResource *get();
+ bool isFinishedWithNoError();
QByteArray readData();
bool saveData(const QString &path);
--
GitLab