From: alex-z Date: Tue, 6 Dec 2022 12:43:40 +0000 (+0100) Subject: Fix CI errors for Edit Locally. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~90^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=838817239a2f7b12875ab0ece09377f4c1b32785;p=nextcloud-desktop.git Fix CI errors for Edit Locally. Signed-off-by: alex-z --- diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 0c89e52a3..c19212290 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -831,6 +831,7 @@ bool Folder::reloadExcludes() void Folder::startSync(const QStringList &pathList) { + Q_UNUSED(pathList); const auto singleItemDiscoveryOptions = _engine->singleItemDiscoveryOptions(); Q_ASSERT(!singleItemDiscoveryOptions.discoveryDirItem || singleItemDiscoveryOptions.discoveryDirItem->isDirectory()); if (singleItemDiscoveryOptions.discoveryDirItem && !singleItemDiscoveryOptions.discoveryDirItem->isDirectory()) { diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h index ba671ec2f..f325ea484 100644 --- a/src/libsync/syncengine.h +++ b/src/libsync/syncengine.h @@ -125,8 +125,11 @@ public: static void switchToVirtualFiles(const QString &localPath, SyncJournalDb &journal, Vfs &vfs); [[nodiscard]] QSharedPointer getPropagator() const { return _propagator; } // for the test + [[nodiscard]] const SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions() const; public slots: + void setSingleItemDiscoveryOptions(const SingleItemDiscoveryOptions &singleItemDiscoveryOptions); + void startSync(); /* Abort the sync. Called from the main thread */ @@ -148,10 +151,6 @@ public slots: * sync's style. */ void setLocalDiscoveryOptions(OCC::LocalDiscoveryStyle style, std::set paths = {}); - - void setSingleItemDiscoveryOptions(const SingleItemDiscoveryOptions &singleItemDiscoveryOptions); - [[nodiscard]] const SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions() const; - void addAcceptedInvalidFileName(const QString& filePath); signals: