diff options
author | Felix Weilbach <felix.weilbach@nextcloud.com> | 2021-09-10 16:51:48 +0300 |
---|---|---|
committer | Felix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de> | 2021-09-17 16:32:26 +0300 |
commit | fb1b3481d19c860f7ff5a22663822cdf38d636bc (patch) | |
tree | 4c8b06a6404acd92372759183bf59d62edeb32d5 /src/libsync | |
parent | 1eb9c6f9937e4e47115056687649d7caf6865c9b (diff) |
Fix warnings
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
Diffstat (limited to 'src/libsync')
-rw-r--r-- | src/libsync/clientsideencryption.cpp | 2 | ||||
-rw-r--r-- | src/libsync/discovery.cpp | 2 | ||||
-rw-r--r-- | src/libsync/owncloudpropagator.cpp | 2 | ||||
-rw-r--r-- | src/libsync/propagatedownload.cpp | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index dd11ca90c..a5621409a 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -1958,4 +1958,4 @@ bool EncryptionHelper::StreamingDecryptor::isFinished() const { return _isFinished; } -}; +} diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 7c58e1794..88434229f 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -507,7 +507,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo( const bool isVfsModeOn = _discoveryData && _discoveryData->_syncOptions._vfs && _discoveryData->_syncOptions._vfs->mode() != Vfs::Off; if (isVfsModeOn && dbEntry.isDirectory() && dbEntry._isE2eEncrypted) { qint64 localFolderSize = 0; - const auto listFilesCallback = [this, &localFolderSize](const OCC::SyncJournalFileRecord &record) { + const auto listFilesCallback = [&localFolderSize](const OCC::SyncJournalFileRecord &record) { if (record.isFile()) { // add Constants::e2EeTagSize so we will know the size of E2EE file on the server localFolderSize += record._fileSize + Constants::e2EeTagSize; diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 352ec32c2..29dc5f23f 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -27,6 +27,7 @@ #include "account.h" #include "common/asserts.h" #include "discoveryphase.h" +#include "syncfileitem.h" #ifdef Q_OS_WIN #include <windef.h> @@ -269,6 +270,7 @@ void PropagateItemJob::done(SyncFileItem::Status statusArg, const QString &error case SyncFileItem::NoStatus: case SyncFileItem::BlacklistedError: case SyncFileItem::FileLocked: + case SyncFileItem::FileNameInvalid: // nothing break; } diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index cdda9abeb..e6b7383b9 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -78,7 +78,6 @@ GETFileJob::GETFileJob(AccountPtr account, const QString &path, QIODevice *devic , _headers(headers) , _expectedEtagForResume(expectedEtagForResume) , _expectedContentLength(-1) - , _contentLength(-1) , _resumeStart(resumeStart) , _errorStatus(SyncFileItem::NoStatus) , _bandwidthLimited(false) @@ -87,6 +86,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QString &path, QIODevice *devic , _bandwidthManager(nullptr) , _hasEmittedFinishedSignal(false) , _lastModified() + , _contentLength(-1) { } @@ -94,10 +94,10 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, QIODevice *device, const QMap<QByteArray, QByteArray> &headers, const QByteArray &expectedEtagForResume, qint64 resumeStart, QObject *parent) : AbstractNetworkJob(account, url.toEncoded(), parent) + , _device(device) , _headers(headers) , _expectedEtagForResume(expectedEtagForResume) , _expectedContentLength(-1) - , _contentLength(-1) , _resumeStart(resumeStart) , _errorStatus(SyncFileItem::NoStatus) , _directDownloadUrl(url) @@ -107,7 +107,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, QIODevice *device, , _bandwidthManager(nullptr) , _hasEmittedFinishedSignal(false) , _lastModified() - , _device(device) + , _contentLength(-1) { } |