Просмотр исходного кода

Fix warnings related to wrong ordering of ctor init

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
Felix Weilbach 4 лет назад
Родитель
Сommit
4d72d375f2
2 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      src/libsync/discovery.h
  2. 4 4
      src/libsync/owncloudpropagator.h

+ 1 - 1
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);
     }

+ 4 - 4
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>("PropagatorJob::AbortType");
     }