From: Olivier Goffart <ogoffart@woboq.com>
Date: Wed, 18 Jan 2017 09:19:05 +0000 (+0100)
Subject: Fix more compilation errors with Qt 4
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~898
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b046cca0100c3ac400062e7e7e96920785fb4900;p=nextcloud-desktop.git

Fix more compilation errors with Qt 4

Ammand last commit which was a fixup to the change from pull request #5468
for issue #5453
---

diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index cf8400cf0..09891b65b 100644
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -358,7 +358,7 @@ void PropagateUploadFileNG::slotPutFinished()
         // Abort the job and try again later.
         // This works around a bug in QNAM wich might reuse a non-empty buffer for the next request.
         qDebug() << "Forcing job abort on HTTP connection reset with Qt < 5.4.2.";
-        _propagator->_anotherSyncNeeded = true;
+        propagator()->_anotherSyncNeeded = true;
         abortWithError(SyncFileItem::SoftError, tr("Forcing job abort on HTTP connection reset with Qt < 5.4.2."));
         return;
     }
diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index f35af90c7..771b282ad 100644
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -46,7 +46,7 @@ namespace OCC {
  * in the database.  But in case of error, we need to remove the entries from the database of the files
  * that were deleted.
  *
- * \a path is relative to _propagator->_localDir + _item->_file and should start with a slash
+ * \a path is relative to propagator()->_localDir + _item->_file and should start with a slash
  */
 bool PropagateLocalRemove::removeRecursively(const QString& path)
 {