Skip to content
Snippets Groups Projects
Commit 2cf907cd authored by akiraohgaki's avatar akiraohgaki
Browse files

Code cleanup

parent 00105cec
No related branches found
No related tags found
No related merge requests found
...@@ -11,12 +11,10 @@ Network::Network(const bool &async, QObject *parent) : ...@@ -11,12 +11,10 @@ Network::Network(const bool &async, QObject *parent) :
QObject(parent), async_(async) QObject(parent), async_(async)
{ {
manager_ = new QNetworkAccessManager(this); manager_ = new QNetworkAccessManager(this);
connect(manager_, &QNetworkAccessManager::finished, connect(manager_, &QNetworkAccessManager::finished, this, &Network::finished);
this, &Network::finished);
if (!async_) { if (!async_) {
eventLoop_ = new QEventLoop(); eventLoop_ = new QEventLoop();
connect(manager_, &QNetworkAccessManager::finished, connect(manager_, &QNetworkAccessManager::finished, eventLoop_, &QEventLoop::quit);
eventLoop_, &QEventLoop::quit);
} }
} }
...@@ -40,8 +38,7 @@ QNetworkReply *Network::head(const QUrl &uri) ...@@ -40,8 +38,7 @@ QNetworkReply *Network::head(const QUrl &uri)
QNetworkReply *Network::get(const QUrl &uri) QNetworkReply *Network::get(const QUrl &uri)
{ {
QNetworkReply *reply = manager_->get(QNetworkRequest(uri)); QNetworkReply *reply = manager_->get(QNetworkRequest(uri));
connect(reply, &QNetworkReply::downloadProgress, connect(reply, &QNetworkReply::downloadProgress, this, &Network::downloadProgress);
this, &Network::downloadProgress);
if (!async_) { if (!async_) {
eventLoop_->exec(); eventLoop_->exec();
} }
......
...@@ -87,8 +87,7 @@ void XdgUrl::downloaded(QNetworkReply *reply) ...@@ -87,8 +87,7 @@ void XdgUrl::downloaded(QNetworkReply *reply)
emit error(result); emit error(result);
return; return;
} }
else if (reply->hasRawHeader("Location")) {
if (reply->hasRawHeader("Location")) {
QString redirectUrl = QString(reply->rawHeader("Location")); QString redirectUrl = QString(reply->rawHeader("Location"));
if (redirectUrl.startsWith("/")) { if (redirectUrl.startsWith("/")) {
redirectUrl = reply->url().authority() + redirectUrl; redirectUrl = reply->url().authority() + redirectUrl;
...@@ -96,8 +95,7 @@ void XdgUrl::downloaded(QNetworkReply *reply) ...@@ -96,8 +95,7 @@ void XdgUrl::downloaded(QNetworkReply *reply)
network_->get(QUrl(redirectUrl)); network_->get(QUrl(redirectUrl));
return; return;
} }
else if (reply->hasRawHeader("Refresh")) {
if (reply->hasRawHeader("Refresh")) {
QString refreshUrl = QString(reply->rawHeader("Refresh")).split("url=").last(); QString refreshUrl = QString(reply->rawHeader("Refresh")).split("url=").last();
if (refreshUrl.startsWith("/")) { if (refreshUrl.startsWith("/")) {
refreshUrl = reply->url().authority() + refreshUrl; refreshUrl = reply->url().authority() + refreshUrl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment