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

Merge pull request #5291 from nextcloud/bugfix/qfileinfo-exists

Browse source 
Use QFileInfo::exists where we are only creating a QFileInfo to check if file exists
This commit is contained in:
Claudio Cambra 2022-12-20 12:07:09 +01:00 committed by GitHub
commit cdc58c3053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/tray/usermodel.cpp
View file

@ -493,24 +493,24 @@ void User::slotProgressInfo(const QString &folder, const ProgressInfo &progress)
continue;
}
if (activity._syncFileItemStatus == SyncFileItem::Conflict && !QFileInfo(f->path() + activity._file).exists()) {
if (activity._syncFileItemStatus == SyncFileItem::Conflict && !QFileInfo::exists(f->path() + activity._file)) {
_activityModel->removeActivityFromActivityList(activity);
continue;
}
if (activity._syncFileItemStatus == SyncFileItem::FileLocked && !QFileInfo(f->path() + activity._file).exists()) {
if (activity._syncFileItemStatus == SyncFileItem::FileLocked && !QFileInfo::exists(f->path() + activity._file)) {
_activityModel->removeActivityFromActivityList(activity);
continue;
}
if (activity._syncFileItemStatus == SyncFileItem::FileIgnored && !QFileInfo(f->path() + activity._file).exists()) {
if (activity._syncFileItemStatus == SyncFileItem::FileIgnored && !QFileInfo::exists(f->path() + activity._file)) {
_activityModel->removeActivityFromActivityList(activity);
continue;
}
if (!QFileInfo(f->path() + activity._file).exists()) {
if (!QFileInfo::exists(f->path() + activity._file)) {
_activityModel->removeActivityFromActivityList(activity);
continue;
}

2
src/libsync/syncengine.cpp
View file

@ -286,7 +286,7 @@ void SyncEngine::conflictRecordMaintenance()
const auto conflictRecordPaths = _journal->conflictRecordPaths();
for (const auto &path : conflictRecordPaths) {
auto fsPath = _propagator->fullLocalPath(QString::fromUtf8(path));
if (!QFileInfo(fsPath).exists()) {
if (!QFileInfo::exists(fsPath)) {
_journal->deleteConflictRecord(path);
}
}