Skip to content

Commit

Permalink
Fix CI errors.
Browse files Browse the repository at this point in the history
Signed-off-by: alex-z <[email protected]>
  • Loading branch information
allexzander committed Jan 15, 2024
1 parent 13d5e2b commit 16ec906
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/libsync/encryptedfoldermetadatahandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/libsync/encryptedfoldermetadatahandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/foldermetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/foldermetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 16ec906

Please sign in to comment.