84 lines
4.0 KiB
Diff
84 lines
4.0 KiB
Diff
Index: client-2.10.1/src/common/asserts.h
|
|
===================================================================
|
|
--- client-2.10.1.orig/src/common/asserts.h
|
|
+++ client-2.10.1/src/common/asserts.h
|
|
@@ -44,7 +44,7 @@
|
|
} else { \
|
|
}
|
|
|
|
-inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
|
|
+OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
|
|
{
|
|
if (Q_UNLIKELY(!condition)) {
|
|
OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file, line, info);
|
|
Index: client-2.10.1/src/common/vfs.h
|
|
===================================================================
|
|
--- client-2.10.1.orig/src/common/vfs.h
|
|
+++ client-2.10.1/src/common/vfs.h
|
|
@@ -162,17 +162,17 @@ public:
|
|
virtual bool isHydrating() const = 0;
|
|
|
|
/// Create a new dehydrated placeholder. Called from PropagateDownload.
|
|
- virtual OC_REQUIRED_RESULT Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
|
|
+ OC_REQUIRED_RESULT virtual Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
|
|
|
|
/** Discovery hook: even unchanged files may need UPDATE_METADATA.
|
|
*
|
|
* For instance cfapi vfs wants local hydrated non-placeholder files to
|
|
* become hydrated placeholder files.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0;
|
|
+ OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0;
|
|
|
|
/// Determine whether the file at the given absolute path is a dehydrated placeholder.
|
|
- virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0;
|
|
+ OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0;
|
|
|
|
/** Similar to isDehydratedPlaceholder() but used from sync discovery.
|
|
*
|
|
@@ -181,7 +181,7 @@ public:
|
|
*
|
|
* Returning true means that type was fully determined.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
|
|
+ OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
|
|
|
|
/** Sets the pin state for the item at a path.
|
|
*
|
|
@@ -192,7 +192,7 @@ public:
|
|
*
|
|
* relFilePath is relative to the sync folder. Can be "" for root folder.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath, PinState state) = 0;
|
|
+ OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath, PinState state) = 0;
|
|
|
|
/** Returns the pin state of an item at a path.
|
|
*
|
|
@@ -203,7 +203,7 @@ public:
|
|
*
|
|
* Returns none on retrieval error.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT Optional<PinState> pinState(const QString &relFilePath) = 0;
|
|
+ OC_REQUIRED_RESULT virtual Optional<PinState> pinState(const QString &relFilePath) = 0;
|
|
|
|
/** Returns availability status of an item at a path.
|
|
*
|
|
@@ -212,7 +212,7 @@ public:
|
|
*
|
|
* folderPath is relative to the sync folder. Can be "" for root folder.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0;
|
|
+ OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0;
|
|
|
|
public slots:
|
|
/** Update in-sync state based on SyncFileStatusTracker signal.
|
|
@@ -240,7 +240,7 @@ protected:
|
|
* If the remote metadata changes, the local placeholder's metadata should possibly
|
|
* change as well.
|
|
*/
|
|
- virtual OC_REQUIRED_RESULT Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
|
|
+ OC_REQUIRED_RESULT virtual Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
|
|
|
|
/** Setup the plugin for the folder.
|
|
*
|