Merge pull request #5241 from nextcloud/bugfix/edit-locally-ci-errors

Fix CI errors for Edit Locally.
nextcloud · Dec 6, 2022 · adbd41e · adbd41e
2 parents f6ac52b + 8388172
commit adbd41e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -125,8 +125,11 @@ class OWNCLOUDSYNC_EXPORT SyncEngine : public QObject
     static void switchToVirtualFiles(const QString &localPath, SyncJournalDb &journal, Vfs &vfs);
 
     [[nodiscard]] QSharedPointer<OwncloudPropagator> 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<QString> paths = {});
-
-    void setSingleItemDiscoveryOptions(const SingleItemDiscoveryOptions &singleItemDiscoveryOptions);
-    [[nodiscard]] const SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions() const;
-
     void addAcceptedInvalidFileName(const QString& filePath);
 
 signals: