From f2943a594dc6cb867ad56a953c1e712d5d31e237 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 25 Feb 2016 16:26:27 +0100 Subject: [PATCH] Unify download/upload methods params. --- src/network-web/networkfactory.cpp | 11 +++++------ src/network-web/networkfactory.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/network-web/networkfactory.cpp b/src/network-web/networkfactory.cpp index 7d71c19e8..4a69784da 100755 --- a/src/network-web/networkfactory.cpp +++ b/src/network-web/networkfactory.cpp @@ -151,19 +151,18 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList &u NetworkResult NetworkFactory::uploadData(const QString &url, int timeout, const QByteArray &input_data, const QString &input_content_type, QByteArray &output, QNetworkAccessManager::Operation operation, bool protected_contents, - const QString &username, const QString &password, bool forcefully_embed_basic_header) { + const QString &username, const QString &password, bool set_basic_header) { Downloader downloader; QEventLoop loop; NetworkResult result; downloader.appendRawHeader("Content-Type", input_content_type.toLocal8Bit()); - if (forcefully_embed_basic_header) { - QString concatenated = username + ":" + password; - QByteArray data = concatenated.toLocal8Bit().toBase64(); - QString headerData = QString("Basic ") + data; + if (set_basic_header) { + QString basic_value = username + ":" + password; + QString header_value = QString("Basic ") + QString(basic_value.toUtf8().toBase64()); - downloader.appendRawHeader("Authorization", headerData.toLocal8Bit()); + downloader.appendRawHeader("Authorization", header_value.toLocal8Bit()); } // We need to quit event loop when the download finishes. diff --git a/src/network-web/networkfactory.h b/src/network-web/networkfactory.h index 51541e262..dc77c350d 100755 --- a/src/network-web/networkfactory.h +++ b/src/network-web/networkfactory.h @@ -47,7 +47,7 @@ class NetworkFactory { const QString &input_content_type, QByteArray &output, QNetworkAccessManager::Operation operation, bool protected_contents = false, const QString &username = QString(), - const QString &password = QString(), bool forcefully_embed_basic_header = false); + const QString &password = QString(), bool set_basic_header = false); static NetworkResult downloadFeedFile(const QString &url, int timeout, QByteArray &output, bool protected_contents = false, const QString &username = QString(),