mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
Merge pull request #5241 from nextcloud/bugfix/edit-locally-ci-errors
Fix CI errors for Edit Locally.
This commit is contained in:
commit
adbd41e773
2 changed files with 4 additions and 4 deletions
|
@ -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()) {
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue