mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

More compilation fixes after the merge

Browse source
This commit is contained in:
Olivier Goffart 2015-05-26 12:33:19 +02:00
parent 6b27d2e703
commit 54a42e401b
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsync/propagatedownload.cpp
View file

@ -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);
}
}

22
src/libsync/propagateupload.cpp
View file

@ -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);
}