[Pkg-owncloud-commits] [owncloud-client] 80/498: Fix the build

[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 ea39e457f5c108d16a4a86942938b9b2e750513e
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Tue May 12 10:35:28 2015 +0200

    Fix the build
---
 src/libsync/propagatedownload.cpp | 8 ++++----
 src/libsync/propagateupload.cpp   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 6fde599..6962867 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -332,7 +332,7 @@ void PropagateDownloadFileQNAM::start()
     }
 
     if (tmpFileName.isEmpty()) {
-        tmpFileName = createDownloadTmpFileName(_item._file);
+        tmpFileName = createDownloadTmpFileName(_item->_file);
     }
 
     _tmpFile.setFileName(_propagator->getFilePath(tmpFileName));
@@ -534,7 +534,7 @@ void PropagateDownloadFileQNAM::downloadFinished()
         }
     }
 
-    FileSystem::setModTime(_tmpFile.fileName(), _item._modtime);
+    FileSystem::setModTime(_tmpFile.fileName(), _item->_modtime);
     // We need to fetch the time again because some file system such as FAT have a less than a second
     // Accuracy, and we really need the time from the file system. (#3103)
     _item->_modtime = FileSystem::getModTime(_tmpFile.fileName());
@@ -550,8 +550,8 @@ void PropagateDownloadFileQNAM::downloadFinished()
         // phase by comparing size and mtime to the previous values. This
         // is necessary to avoid overwriting user changes that happened between
         // the discovery phase and now.
-        const qint64 expectedSize = _item.log._other_size;
-        const time_t expectedMtime = _item.log._other_modtime;
+        const qint64 expectedSize = _item->log._other_size;
+        const time_t expectedMtime = _item->log._other_modtime;
         if (! FileSystem::verifyFileUnchanged(fn, expectedSize, expectedMtime)) {
             _propagator->_anotherSyncNeeded = true;
             done(SyncFileItem::SoftError, tr("File has changed since discovery"));
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 946975f..8af40cb 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -574,7 +574,7 @@ void PropagateUploadFileQNAM::slotPutFinished()
     }
 
     // Check whether the file changed since discovery.
-    if (! FileSystem::verifyFileUnchanged(fullFilePath, _item._size, _item._modtime)) {
+    if (! FileSystem::verifyFileUnchanged(fullFilePath, _item->_size, _item->_modtime)) {
         _propagator->_anotherSyncNeeded = true;
         if( !finished ) {
             abortWithError(SyncFileItem::SoftError, tr("Local file changed during sync."));

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