Fix deprecation warnings.

Signed-off-by: allexzander <blackslayer4@gmail.com>

diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
index 14bc2617cb293084239a6f6b2a64c4dd30a10ccc..1fd296315266c8ac8095b97c0528d2cb9620ecb9 100644 (file)
--- a/src/gui/connectionvalidator.cpp
+++ b/src/gui/connectionvalidator.cpp
@@ -278,7 +278,7 @@ bool ConnectionValidator::setAndCheckServerVersion(const QString &version)
     if (auto job = qobject_cast<AbstractNetworkJob *>(sender())) {
         if (auto reply = job->reply()) {
             _account->setHttp2Supported(
-                reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool());
+                reply->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool());
         }
     }
 #endif

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index ed08bf9e2f1c37b94e124a4c104a89f2f3924241..ed5b222f4bc2690c34407f16a396491e1e9ef05a 100644 (file)
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -400,7 +400,7 @@ QRect FolderStatusDelegate::optionsButtonRect(QRect within, Qt::LayoutDirection
     opt.rect.setSize(QSize(e,e));
     QSize size = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &opt, opt.rect.size()).expandedTo(QApplication::globalStrut());
 
-    int margin = QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
+    int margin = QApplication::style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
     QRect r(QPoint(within.right() - size.width() - margin,
                 within.top() + within.height() / 2 - size.height() / 2),
         size);

diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp
index feac006010d91cf17f95f4e67526cc1f6cbc5937..ef2dc75f48f587b22688a3e5a718c4bb0275a3e0 100644 (file)
--- a/src/libsync/abstractnetworkjob.cpp
+++ b/src/libsync/abstractnetworkjob.cpp
@@ -188,7 +188,7 @@ void AbstractNetworkJob::slotFinished()
     const auto maxHttp2Resends = 3;
     QByteArray verb = HttpLogger::requestVerb(*reply());
     if (_reply->error() == QNetworkReply::ContentReSendError
-        && _reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool()) {
+        && _reply->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()) {
 
         if ((_requestBody && !_requestBody->isSequential()) || verb.isEmpty()) {
             qCWarning(lcNetworkJob) << "Can't resend HTTP2 request, verb or body not suitable"

diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index fa04e6c6bf3b4f1c7a853cf12464dff95cd3c1ab..00b08d3f585a5323f22f0fa2048a24b7ac133ffc 100644 (file)
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -84,7 +84,7 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op,
         // http2 seems to cause issues, as with our recommended server setup we don't support http2, disable it by default for now
         static const bool http2EnabledEnv = qEnvironmentVariableIntValue("OWNCLOUD_HTTP2_ENABLED") == 1;
 
-        newRequest.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, http2EnabledEnv);
+        newRequest.setAttribute(QNetworkRequest::Http2AllowedAttribute, http2EnabledEnv);
     }
 #endif
 

diff --git a/src/libsync/iconjob.cpp b/src/libsync/iconjob.cpp
index 23a7ace7fb176fee64c0aa61cc962bb9fb8c0cb8..68263fc673b93443850211dc6720da6b296b2bca 100644 (file)
--- a/src/libsync/iconjob.cpp
+++ b/src/libsync/iconjob.cpp
@@ -21,7 +21,7 @@ IconJob::IconJob(AccountPtr account, const QUrl &url, QObject *parent)
 {
     QNetworkRequest request(url);
 #if (QT_VERSION >= 0x050600)
-    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, true);
 #endif
     const auto reply = account->sendRawRequest(QByteArrayLiteral("GET"), url, request);
     connect(reply, &QNetworkReply::finished, this, &IconJob::finished);

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 1474d3f884df3af7e0611d20080a2366afebffc2..088ce72895625a7a5110c985aea7150ead03e18f 100644 (file)
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -865,7 +865,7 @@ void PropagateDownloadFile::slotGetFinished()
     // of the compressed data. See QTBUG-73364.
     const auto contentEncoding = job->reply()->rawHeader("content-encoding").toLower();
     if ((contentEncoding == "gzip" || contentEncoding == "deflate")
-        && (job->reply()->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool()
+        && (job->reply()->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()
          || job->reply()->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool())) {
         bodySize = 0;
         hasSizeHeader = false;

diff --git a/test/testdownload.cpp b/test/testdownload.cpp
index 80d85e4bdccb78a0e693fccc41a4fd60829beba9..f534f1a1eb776ec1a3452f6845a082cdac9fb853 100644 (file)
--- a/test/testdownload.cpp
+++ b/test/testdownload.cpp
@@ -220,7 +220,7 @@ private slots:
             if (op == QNetworkAccessManager::GetOperation && request.url().path().endsWith("A/resendme") && resendActual < resendExpected) {
                 auto errorReply = new FakeErrorReply(op, request, this, 400, "ignore this body");
                 errorReply->setError(QNetworkReply::ContentReSendError, serverMessage);
-                errorReply->setAttribute(QNetworkRequest::HTTP2WasUsedAttribute, true);
+                errorReply->setAttribute(QNetworkRequest::Http2WasUsedAttribute, true);
                 errorReply->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, QVariant());
                 resendActual += 1;
                 return errorReply;