dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetworkAccessManager: Rename variables

Browse Source
This commit is contained in:
Jonas Kvinge
2025-07-28 22:39:32 +02:00
parent 390bf049f2
commit 26b5588d7d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/networkaccessmanager.cpp
View File

@@ -43,29 +43,29 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
} }
QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) { QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &network_request, QIODevice *outgoing_data) {
QByteArray user_agent; QByteArray user_agent;
if (request.hasRawHeader("User-Agent")) { if (network_request.hasRawHeader("User-Agent")) {
user_agent = request.header(QNetworkRequest::UserAgentHeader).toByteArray(); user_agent = network_request.header(QNetworkRequest::UserAgentHeader).toByteArray();
} }
else { else {
user_agent = QStringLiteral("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()).toUtf8(); user_agent = QStringLiteral("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()).toUtf8();
} }
QNetworkRequest new_request(request); QNetworkRequest new_network_request(network_request);
new_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); new_network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
new_request.setHeader(QNetworkRequest::UserAgentHeader, user_agent); new_network_request.setHeader(QNetworkRequest::UserAgentHeader, user_agent);
if (op == QNetworkAccessManager::PostOperation && !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) { if (op == QNetworkAccessManager::PostOperation && !new_network_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {
new_request.setHeader(QNetworkRequest::ContentTypeHeader, u"application/x-www-form-urlencoded"_s); new_network_request.setHeader(QNetworkRequest::ContentTypeHeader, u"application/x-www-form-urlencoded"_s);
} }
// Prefer the cache unless the caller has changed the setting already // Prefer the cache unless the caller has changed the setting already
if (request.attribute(QNetworkRequest::CacheLoadControlAttribute).toInt() == QNetworkRequest::PreferNetwork) { if (network_request.attribute(QNetworkRequest::CacheLoadControlAttribute).toInt() == QNetworkRequest::PreferNetwork) {
new_request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); new_network_request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
} }
return QNetworkAccessManager::createRequest(op, new_request, outgoingData); return QNetworkAccessManager::createRequest(op, new_network_request, outgoing_data);
} }

2
src/core/networkaccessmanager.h
View File

@@ -38,7 +38,7 @@ class NetworkAccessManager : public QNetworkAccessManager {
explicit NetworkAccessManager(QObject *parent = nullptr); explicit NetworkAccessManager(QObject *parent = nullptr);
protected: protected:
QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override; QNetworkReply *createRequest(Operation op, const QNetworkRequest &network_request, QIODevice *outgoing_data) override;
}; };
#endif // NETWORKACCESSMANAGER_H #endif // NETWORKACCESSMANAGER_H