mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fix CI errors for Edit Locally.
This commit is contained in:
allexzander 2022-12-06 16:13:32 +01:00 committed by GitHub
commit adbd41e773
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/folder.cpp
View file

@ -831,6 +831,7 @@ bool Folder::reloadExcludes()
void Folder::startSync(const QStringList &pathList) void Folder::startSync(const QStringList &pathList)
{ {
Q_UNUSED(pathList);
const auto singleItemDiscoveryOptions = _engine->singleItemDiscoveryOptions(); const auto singleItemDiscoveryOptions = _engine->singleItemDiscoveryOptions();
Q_ASSERT(!singleItemDiscoveryOptions.discoveryDirItem || singleItemDiscoveryOptions.discoveryDirItem->isDirectory()); Q_ASSERT(!singleItemDiscoveryOptions.discoveryDirItem || singleItemDiscoveryOptions.discoveryDirItem->isDirectory());
if (singleItemDiscoveryOptions.discoveryDirItem && !singleItemDiscoveryOptions.discoveryDirItem->isDirectory()) { if (singleItemDiscoveryOptions.discoveryDirItem && !singleItemDiscoveryOptions.discoveryDirItem->isDirectory()) {

7
src/libsync/syncengine.h
View file

@ -125,8 +125,11 @@ public:
static void switchToVirtualFiles(const QString &localPath, SyncJournalDb &journal, Vfs &vfs); static void switchToVirtualFiles(const QString &localPath, SyncJournalDb &journal, Vfs &vfs);
[[nodiscard]] QSharedPointer<OwncloudPropagator> getPropagator() const { return _propagator; } // for the test [[nodiscard]] QSharedPointer<OwncloudPropagator> getPropagator() const { return _propagator; } // for the test
[[nodiscard]] const SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions() const;
public slots: public slots:
void setSingleItemDiscoveryOptions(const SingleItemDiscoveryOptions &singleItemDiscoveryOptions);
void startSync(); void startSync();
/* Abort the sync. Called from the main thread */ /* Abort the sync. Called from the main thread */
@ -148,10 +151,6 @@ public slots:
* sync's style. * sync's style.
*/ */
void setLocalDiscoveryOptions(OCC::LocalDiscoveryStyle style, std::set<QString> paths = {}); 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); void addAcceptedInvalidFileName(const QString& filePath);
signals: signals: