From 03c393160c0155aaa8ed98cb573ee7e945288e41 Mon Sep 17 00:00:00 2001 From: alex-z Date: Mon, 15 Jan 2024 13:33:15 +0100 Subject: [PATCH] Fix CI errors. Signed-off-by: alex-z --- src/libsync/encryptedfoldermetadatahandler.cpp | 8 ++++---- src/libsync/encryptedfoldermetadatahandler.h | 8 ++++---- src/libsync/foldermetadata.cpp | 2 +- src/libsync/foldermetadata.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libsync/encryptedfoldermetadatahandler.cpp b/src/libsync/encryptedfoldermetadatahandler.cpp index 024e5f33637b9..5177e0fd4938a 100644 --- a/src/libsync/encryptedfoldermetadatahandler.cpp +++ b/src/libsync/encryptedfoldermetadatahandler.cpp @@ -348,7 +348,7 @@ void EncryptedFolderMetadataHandler::setPrefetchedMetadataAndId(const QSharedPoi _isNewMetadataCreated = metadata->initialMetadata().isEmpty(); } -const QByteArray EncryptedFolderMetadataHandler::folderId() const +const QByteArray& EncryptedFolderMetadataHandler::folderId() const { return _folderId; } @@ -358,17 +358,17 @@ void EncryptedFolderMetadataHandler::setFolderToken(const QByteArray &token) _folderToken = token; } -const QByteArray EncryptedFolderMetadataHandler::folderToken() const +const QByteArray& EncryptedFolderMetadataHandler::folderToken() const { return _folderToken; } -const bool EncryptedFolderMetadataHandler::isUnlockRunning() const +bool EncryptedFolderMetadataHandler::isUnlockRunning() const { return _isUnlockRunning; } -const bool EncryptedFolderMetadataHandler::isFolderLocked() const +bool EncryptedFolderMetadataHandler::isFolderLocked() const { return _isFolderLocked; } diff --git a/src/libsync/encryptedfoldermetadatahandler.h b/src/libsync/encryptedfoldermetadatahandler.h index d9875a11b8912..e5426527d4b70 100644 --- a/src/libsync/encryptedfoldermetadatahandler.h +++ b/src/libsync/encryptedfoldermetadatahandler.h @@ -54,12 +54,12 @@ class OWNCLOUDSYNC_EXPORT EncryptedFolderMetadataHandler : public QObject // use this when modifying metadata for multiple folders inside top-level one which is locked void setFolderToken(const QByteArray &token); - [[nodiscard]] const QByteArray folderToken() const; + [[nodiscard]] const QByteArray& folderToken() const; - [[nodiscard]] const QByteArray folderId() const; + [[nodiscard]] const QByteArray& folderId() const; - [[nodiscard]] const bool isUnlockRunning() const; - [[nodiscard]] const bool isFolderLocked() const; + [[nodiscard]] bool isUnlockRunning() const; + [[nodiscard]] bool isFolderLocked() const; void fetchMetadata(const RootEncryptedFolderInfo &rootEncryptedFolderInfo, const FetchMode fetchMode = FetchMode::NonEmptyMetadata); void fetchMetadata(const FetchMode fetchMode = FetchMode::NonEmptyMetadata); diff --git a/src/libsync/foldermetadata.cpp b/src/libsync/foldermetadata.cpp index 26eb96a732453..c610ccda3c5f1 100644 --- a/src/libsync/foldermetadata.cpp +++ b/src/libsync/foldermetadata.cpp @@ -759,7 +759,7 @@ bool FolderMetadata::isVersion2AndUp() const return _existingMetadataVersion >= MetadataVersion::Version2_0; } -const FolderMetadata::MetadataVersion FolderMetadata::latestSupportedMetadataVersion() const +FolderMetadata::MetadataVersion FolderMetadata::latestSupportedMetadataVersion() const { const auto itemEncryptionStatusFromApiVersion = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_account->capabilities().clientSideEncryptionVersion()); return fromItemEncryptionStatusToMedataVersion(itemEncryptionStatusFromApiVersion); diff --git a/src/libsync/foldermetadata.h b/src/libsync/foldermetadata.h index 80f276c68c457..601a141f83b3f 100644 --- a/src/libsync/foldermetadata.h +++ b/src/libsync/foldermetadata.h @@ -162,7 +162,7 @@ public slots: [[nodiscard]] QJsonObject convertFileToJsonObject(const EncryptedFile *encryptedFile, const QByteArray &metadataKey) const; - [[nodiscard]] const MetadataVersion latestSupportedMetadataVersion() const; + [[nodiscard]] MetadataVersion latestSupportedMetadataVersion() const; [[nodiscard]] bool parseFileDropPart(const QJsonDocument &doc);