From: allexzander Date: Sat, 27 Mar 2021 00:41:24 +0000 (+0200) Subject: Fix VFS CfAPI Syncroot Register Error. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~294^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28771b25e371f032e2c953b50e34bde7ba922f92;p=nextcloud-desktop.git Fix VFS CfAPI Syncroot Register Error. Signed-off-by: allexzander --- diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp index dacc61c4b..a2e0584b4 100644 --- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp +++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp @@ -450,7 +450,7 @@ bool deleteSyncRootRegistryKey(const QString &syncRootPath, const QString &provi return true; } -OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString &path, const QString &providerName, const QString &providerVersion, const QString &folderAlias, const QString &displayName, const QString &accountDisplayName) +OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString path, const QString providerName, const QString providerVersion, const QString folderAlias, const QString displayName, const QString accountDisplayName) { // even if we fail to register our sync root with shell, we can still proceed with using the VFS const auto createRegistryKeyResult = createSyncRootRegistryKeys(providerName, folderAlias, displayName, accountDisplayName, path); @@ -489,7 +489,7 @@ OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString &pa } } -OCC::Result OCC::CfApiWrapper::unregisterSyncRoot(const QString &path, const QString &providerName, const QString &accountDisplayName) +OCC::Result OCC::CfApiWrapper::unregisterSyncRoot(const QString path, const QString providerName, const QString accountDisplayName) { const auto deleteRegistryKeyResult = deleteSyncRootRegistryKey(path, providerName, accountDisplayName); Q_ASSERT(deleteRegistryKeyResult); diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.h b/src/libsync/vfs/cfapi/cfapiwrapper.h index 2e8810b45..f315921d3 100644 --- a/src/libsync/vfs/cfapi/cfapiwrapper.h +++ b/src/libsync/vfs/cfapi/cfapiwrapper.h @@ -71,8 +71,8 @@ private: std::unique_ptr _data; }; -OWNCLOUDSYNC_EXPORT Result registerSyncRoot(const QString &path, const QString &providerName, const QString &providerVersion, const QString &folderAlias, const QString &displayName, const QString &accountDisplayName); -OWNCLOUDSYNC_EXPORT Result unregisterSyncRoot(const QString &path, const QString &providerName, const QString &accountDisplayName); +OWNCLOUDSYNC_EXPORT Result registerSyncRoot(const QString path, const QString providerName, const QString providerVersion, const QString folderAlias, const QString displayName, const QString accountDisplayName); +OWNCLOUDSYNC_EXPORT Result unregisterSyncRoot(const QString path, const QString providerName, const QString accountDisplayName); OWNCLOUDSYNC_EXPORT Result connectSyncRoot(const QString &path, VfsCfApi *context); OWNCLOUDSYNC_EXPORT Result disconnectSyncRoot(ConnectionKey &&key);