From 4d72d375f2b449ad45c0527f0f0916ef7b539aea Mon Sep 17 00:00:00 2001 From: Felix Weilbach Date: Fri, 13 Aug 2021 12:25:56 +0200 Subject: [PATCH] Fix warnings related to wrong ordering of ctor init Signed-off-by: Felix Weilbach --- src/libsync/discovery.h | 2 +- src/libsync/owncloudpropagator.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libsync/discovery.h b/src/libsync/discovery.h index bc1737644..e66dc7609 100644 --- a/src/libsync/discovery.h +++ b/src/libsync/discovery.h @@ -78,11 +78,11 @@ public: ProcessDirectoryJob *parent) : QObject(parent) , _dirItem(dirItem) + , _lastSyncTimestamp(lastSyncTimestamp) , _queryServer(queryServer) , _queryLocal(queryLocal) , _discoveryData(parent->_discoveryData) , _currentFolder(path) - , _lastSyncTimestamp(lastSyncTimestamp) { computePinState(parent->_pinState); } diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index f03ef5759..24b6ec0e7 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -183,8 +183,8 @@ private: public: PropagateItemJob(OwncloudPropagator *propagator, const SyncFileItemPtr &item) : PropagatorJob(propagator) - , _item(item) , _parallelism(FullParallelism) + , _item(item) { // we should always execute jobs that process the E2EE API calls as sequential jobs // TODO: In fact, we must make sure Lock/Unlock are not colliding and always wait for each other to complete. So, we could refactor this "_parallelism" later @@ -407,14 +407,14 @@ public: public: OwncloudPropagator(AccountPtr account, const QString &localDir, const QString &remoteFolder, SyncJournalDb *progressDb) - : _localDir((localDir.endsWith(QChar('/'))) ? localDir : localDir + '/') - , _remoteFolder((remoteFolder.endsWith(QChar('/'))) ? remoteFolder : remoteFolder + '/') - , _journal(progressDb) + : _journal(progressDb) , _finishedEmited(false) , _bandwidthManager(this) , _anotherSyncNeeded(false) , _chunkSize(10 * 1000 * 1000) // 10 MB, overridden in setSyncOptions , _account(account) + , _localDir((localDir.endsWith(QChar('/'))) ? localDir : localDir + '/') + , _remoteFolder((remoteFolder.endsWith(QChar('/'))) ? remoteFolder : remoteFolder + '/') { qRegisterMetaType("PropagatorJob::AbortType"); } -- 2.30.2