[Pkg-owncloud-commits] [owncloud-client] 105/498: More compilation fixes after the merge

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 54a42e401bf1f126a6721f8291a227dfc4718131
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue May 26 12:33:19 2015 +0200

    More compilation fixes after the merge
---
 src/libsync/propagatedownload.cpp |  2 +-
 src/libsync/propagateupload.cpp   | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index f7af0b8..c7a5d64 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -656,7 +656,7 @@ void PropagateDownloadFileQNAM::downloadFinished()
     done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);
 
     // handle the special recall file
-    if(_item._file == QLatin1String(".sys.admin#recall#") || _item._file.endsWith("/.sys.admin#recall#")) {
+    if(_item->_file == QLatin1String(".sys.admin#recall#") || _item->_file.endsWith("/.sys.admin#recall#")) {
         handleRecallFile(fn);
     }
 }
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 2cf42c4..7cb6b2e 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -204,7 +204,7 @@ void PropagateUploadFileQNAM::start()
 
     // remember the modtime before checksumming to be able to detect a file
     // change during the checksum calculation
-    _item._modtime = FileSystem::getModTime(filePath);
+    _item->_modtime = FileSystem::getModTime(filePath);
 
     _stopWatch.start();
 
@@ -218,8 +218,8 @@ void PropagateUploadFileQNAM::start()
 
 void PropagateUploadFileQNAM::slotStartUpload(const QByteArray& checksum)
 {
-
-    _item._checksum = checksum;
+    const QString fullFilePath = _propagator->getFilePath(_item->_file);
+    _item->_checksum = checksum;
 
     if (!FileSystem::fileExists(fullFilePath)) {
         done(SyncFileItem::SoftError, tr("File Removed"));
@@ -227,12 +227,12 @@ void PropagateUploadFileQNAM::slotStartUpload(const QByteArray& checksum)
     }
     _stopWatch.addLapTime(QLatin1String("Checksum"));
 
-    time_t prevModtime = _item._modtime; // the _item value was set in PropagateUploadFileQNAM::start()
+    time_t prevModtime = _item->_modtime; // the _item value was set in PropagateUploadFileQNAM::start()
     // but a potential checksum calculation could have taken some time during which the file could
     // have been changed again, so better check again here.
 
     _item->_modtime = FileSystem::getModTime(fullFilePath);
-    if( prevModtime != _item._modtime ) {
+    if( prevModtime != _item->_modtime ) {
         _propagator->_anotherSyncNeeded = true;
         done(SyncFileItem::SoftError, tr("Local file changed during syncing. It will be resumed."));
         return;
@@ -464,14 +464,14 @@ void PropagateUploadFileQNAM::startNextChunk()
             if( currentChunkSize == 0 ) { // if the last chunk pretents to be 0, its actually the full chunk size.
                 currentChunkSize = chunkSize();
             }
-            if( !_item._checksum.isEmpty() ) {
-                headers[checkSumHeaderC] = _item._checksum;
+            if( !_item->_checksum.isEmpty() ) {
+                headers[checkSumHeaderC] = _item->_checksum;
             }
         }
     } else {
         // checksum if its only one chunk
-        if( !_item._checksum.isEmpty() ) {
-            headers[checkSumHeaderC] = _item._checksum;
+        if( !_item->_checksum.isEmpty() ) {
+            headers[checkSumHeaderC] = _item->_checksum;
         }
     }
 
@@ -694,8 +694,8 @@ void PropagateUploadFileQNAM::slotPutFinished()
     }
 
     // performance logging
-    _item._requestDuration = _stopWatch.stop();
-    qDebug() << "*==* duration UPLOAD" << _item._size << _stopWatch.durationOfLap(QLatin1String("Checksum")) << _item._requestDuration;
+    _item->_requestDuration = _stopWatch.stop();
+    qDebug() << "*==* duration UPLOAD" << _item->_size << _stopWatch.durationOfLap(QLatin1String("Checksum")) << _item->_requestDuration;
 
     finalize(*_item);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git