From 0c4d898ea9d16bdb827b6fb9765a025900ff5f35 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 1 Dec 2022 14:36:01 +0100 Subject: [PATCH] replace fn by filename Signed-off-by: Matthieu Gallien --- src/libsync/owncloudpropagator.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 4e59e01af8cbc..fc3f0d55bc280 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -915,17 +915,17 @@ bool OwncloudPropagator::createConflict(const SyncFileItemPtr &item, OCC::Optional OwncloudPropagator::createCaseClashConflict(const SyncFileItemPtr &item, const QString &temporaryDownloadedFile) { - const auto fn = fullLocalPath(item->_file); + const auto filename = fullLocalPath(item->_file); - auto conflictModTime = FileSystem::getModTime(fn); + auto conflictModTime = FileSystem::getModTime(filename); if (conflictModTime <= 0) { - return tr("Impossible to get modification time for file in conflict %1").arg(fn); + return tr("Impossible to get modification time for file in conflict %1").arg(filename); } const auto conflictFileName = Utility::makeCaseClashConflictFileName(item->_file, Utility::qDateTimeFromTime_t(conflictModTime)); const auto conflictFilePath = fullLocalPath(conflictFileName); - emit touchedFile(fn); + emit touchedFile(filename); emit touchedFile(conflictFilePath); qCInfo(lcPropagator) << "rename from" << temporaryDownloadedFile << "to" << conflictFilePath; @@ -934,13 +934,13 @@ OCC::Optional OwncloudPropagator::createCaseClashConflict(const SyncFil // If the file is locked, we want to retry this sync when it // becomes available again. - if (FileSystem::isFileLocked(fn)) { - emit seenLockedFile(fn); + if (FileSystem::isFileLocked(filename)) { + emit seenLockedFile(filename); } return renameError; } - qCInfo(lcPropagator) << "Created case clash conflict file" << fn << "->" << conflictFileName; + qCInfo(lcPropagator) << "Created case clash conflict file" << filename << "->" << conflictFileName; // Create a new conflict record. To get the base etag, we need to read it from the db. auto conflictRecord = ConflictRecord{conflictFileName.toUtf8(), {}, item->_previousModtime, {}, item->_file.toUtf8()};