Fix various deprecated warnings

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index c7cea418c415d516d506bf83ae3868ff24317ec6..da092807b10bf790403849ddcec7765b0d4fa79b 100644 (file)
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -295,9 +295,10 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 
     bool ok = false;
 
-    auto oldBlackListSet = journal->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok).toSet();
+    const auto selectiveSyncList = journal->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
+    const QSet<QString> oldBlackListSet(selectiveSyncList.begin(), selectiveSyncList.end());
     if (ok) {
-        auto blackListSet = newList.toSet();
+        const QSet<QString> blackListSet(newList.begin(), newList.end());
         const auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet);
         for (const auto &it : changes) {
             journal->schedulePathForRemoteDiscovery(it);

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 3ffc048497c6b2b88e02f6d6460c120143c2bf69..51bbe4f748406e5b5f4071498adb5032818f0493 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -907,7 +907,7 @@ void FolderStatusModel::slotApplySelectiveSync()
 
         // The folders that were undecided or blacklisted and that are now checked should go on the white list.
         // The user confirmed them already just now.
-        QStringList toAddToWhiteList = ((oldBlackListSet + folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, &ok).toSet()) - blackListSet).toList();
+        QStringList toAddToWhiteList = ((oldBlackListSet + folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, &ok).toSet()) - blackListSet).values();
 
         if (!toAddToWhiteList.isEmpty()) {
             auto whiteList = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList, &ok);

diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp
index 4b8cc9361721673c86faf05b879886aef27b6289..4a4161434fed942f775b556073911b778cb88537 100644 (file)
--- a/src/gui/openfilemanager.cpp
+++ b/src/gui/openfilemanager.cpp
@@ -103,20 +103,20 @@ void showInFileManager(const QString &localPath)
                 return;
 #endif
 
-            const QString explorer = "explorer.exe "; // FIXME: we trust it's in PATH
-            QFileInfo fi(localPath);
-
-            // canonicalFilePath returns empty if the file does not exist
-            if (!fi.canonicalFilePath().isEmpty()) {
-                QString nativeArgs;
-                if (!fi.isDir()) {
-                    nativeArgs += QLatin1String("/select,");
-                }
-                nativeArgs += QLatin1Char('"');
-                nativeArgs += QDir::toNativeSeparators(fi.canonicalFilePath());
-                nativeArgs += QLatin1Char('"');
-
-                QProcess p;
+        const QString explorer = "explorer.exe "; // FIXME: we trust it's in PATH
+        QFileInfo fi(localPath);
+
+        // canonicalFilePath returns empty if the file does not exist
+        if (!fi.canonicalFilePath().isEmpty()) {
+            QString nativeArgs;
+            if (!fi.isDir()) {
+                nativeArgs += QLatin1String("/select,");
+            }
+            nativeArgs += QLatin1Char('"');
+            nativeArgs += QDir::toNativeSeparators(fi.canonicalFilePath());
+            nativeArgs += QLatin1Char('"');
+
+            QProcess p;
 #ifdef Q_OS_WIN
             // QProcess on Windows tries to wrap the whole argument/program string
             // with quotes if it detects a space in it, but explorer wants the quotes

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 02bcbb39a83e0bb8039ea5cb46e2327436ecc300..8beb34412f4d10549d3cda557194ab039380da76 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -44,6 +44,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
+#include <qsslconfiguration.h>
 #include <qt5keychain/keychain.h>
 #include "creds/abstractcredentials.h"
 
@@ -371,7 +372,7 @@ QSslConfiguration Account::getOrCreateSslConfig()
 void Account::setApprovedCerts(const QList<QSslCertificate> certs)
 {
     _approvedCerts = certs;
-    QSslSocket::addDefaultCaCertificates(certs);
+    QSslConfiguration::defaultConfiguration().addCaCertificates(certs);
 }
 
 void Account::addApprovedCerts(const QList<QSslCertificate> certs)
@@ -463,7 +464,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList<QSslError> errors)
             return;
 
         if (!approvedCerts.isEmpty()) {
-            QSslSocket::addDefaultCaCertificates(approvedCerts);
+            QSslConfiguration::defaultConfiguration().addCaCertificates(approvedCerts);
             addApprovedCerts(approvedCerts);
             emit wantsAccountSaved(this);
 

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index 276bc4f8d050e1aaa2ffff56f01b1b7e6808d5f3..9c4ae0e8ca886f3bbfe836a42ea39ffa9c894855 100644 (file)
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -339,7 +339,7 @@ SyncFileStatus SyncFileStatusTracker::resolveSyncAndErrorStatus(const QString &r
 
 void SyncFileStatusTracker::invalidateParentPaths(const QString &path)
 {
-    QStringList splitPath = path.split('/', QString::SkipEmptyParts);
+    QStringList splitPath = path.split('/', Qt::SkipEmptyParts);
     for (int i = 0; i < splitPath.size(); ++i) {
         QString parentPath = QStringList(splitPath.mid(0, i)).join(QLatin1String("/"));
         emit fileStatusChanged(getSystemDestination(parentPath), fileStatus(parentPath));

diff --git a/test/syncenginetestutils.cpp b/test/syncenginetestutils.cpp
index 001791af27414190d71a6149356ec07da2f908f3..7b5caa94a1d5bcd32bb5a98cffbb437c88badf50 100644 (file)
--- a/test/syncenginetestutils.cpp
+++ b/test/syncenginetestutils.cpp
@@ -20,7 +20,7 @@ PathComponents::PathComponents(const char *path)
 }
 
 PathComponents::PathComponents(const QString &path)
-    : QStringList { path.split(QLatin1Char('/'), QString::SkipEmptyParts) }
+    : QStringList { path.split(QLatin1Char('/'), Qt::SkipEmptyParts) }
 {
 }
 
@@ -796,7 +796,7 @@ void FakeHangingReply::abort()
     // Follow more or less the implementation of QNetworkReplyImpl::abort
     close();
     setError(OperationCanceledError, tr("Operation canceled"));
-    emit error(OperationCanceledError);
+    emit errorOccurred(OperationCanceledError);
     setFinished(true);
     emit finished();
 }