From 2cf907cd00ed159511a5001436d43dfc0a407e7a Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 25 Oct 2016 02:50:48 +0900
Subject: [PATCH] Code cleanup
---
src/core/network.cpp | 9 +++------
src/handlers/xdgurl.cpp | 6 ++----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/core/network.cpp b/src/core/network.cpp
index b7c9f93..4c65f3b 100644
--- a/src/core/network.cpp
+++ b/src/core/network.cpp
@@ -11,12 +11,10 @@ Network::Network(const bool &async, QObject *parent) :
QObject(parent), async_(async)
{
manager_ = new QNetworkAccessManager(this);
- connect(manager_, &QNetworkAccessManager::finished,
- this, &Network::finished);
+ connect(manager_, &QNetworkAccessManager::finished, this, &Network::finished);
if (!async_) {
eventLoop_ = new QEventLoop();
- connect(manager_, &QNetworkAccessManager::finished,
- eventLoop_, &QEventLoop::quit);
+ connect(manager_, &QNetworkAccessManager::finished, eventLoop_, &QEventLoop::quit);
}
}
@@ -40,8 +38,7 @@ QNetworkReply *Network::head(const QUrl &uri)
QNetworkReply *Network::get(const QUrl &uri)
{
QNetworkReply *reply = manager_->get(QNetworkRequest(uri));
- connect(reply, &QNetworkReply::downloadProgress,
- this, &Network::downloadProgress);
+ connect(reply, &QNetworkReply::downloadProgress, this, &Network::downloadProgress);
if (!async_) {
eventLoop_->exec();
}
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index 00e3690..8f1530b 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -87,8 +87,7 @@ void XdgUrl::downloaded(QNetworkReply *reply)
emit error(result);
return;
}
-
- if (reply->hasRawHeader("Location")) {
+ else if (reply->hasRawHeader("Location")) {
QString redirectUrl = QString(reply->rawHeader("Location"));
if (redirectUrl.startsWith("/")) {
redirectUrl = reply->url().authority() + redirectUrl;
@@ -96,8 +95,7 @@ void XdgUrl::downloaded(QNetworkReply *reply)
network_->get(QUrl(redirectUrl));
return;
}
-
- if (reply->hasRawHeader("Refresh")) {
+ else if (reply->hasRawHeader("Refresh")) {
QString refreshUrl = QString(reply->rawHeader("Refresh")).split("url=").last();
if (refreshUrl.startsWith("/")) {
refreshUrl = reply->url().authority() + refreshUrl;
--
GitLab