From b3d57f3c7c6351eb74abc971f8dee5274679e04b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 22 Feb 2016 16:14:22 +0100 Subject: [PATCH] Cleanup syncengine after the new option not to ask confirmation when everything is removed Cleanup after pull reuqest #4389 Do not make the SyncEngine depends on the ConfigFile --- src/gui/folder.cpp | 4 ++++ src/libsync/syncengine.cpp | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 04e134e69..011039431 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -1175,6 +1175,10 @@ void Folder::slotNewBigFolderDiscovered(const QString &newF) void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel) { + ConfigFile cfgFile; + if (!cfgFile.promptDeleteFiles()) + return; + QString msg = tr("This sync would remove all the files in the sync folder '%1'.\n" "This might be because the folder was silently reconfigured, or that all " diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index 8f4f2c03c..ac3b3ea08 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -23,7 +23,6 @@ #include "syncfilestatus.h" #include "csync_private.h" #include "filesystem.h" -#include "configfile.h" #ifdef Q_OS_WIN #include @@ -842,9 +841,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult) } } - // Check the config file before displaying prompt in case it is disabled. - ConfigFile cfgFile; - if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) { + if (!_hasNoneFiles && _hasRemoveFile) { qDebug() << Q_FUNC_INFO << "All the files are going to be changed, asking the user"; bool cancel = false; emit aboutToRemoveAllFiles(_syncedItems.first()->_direction, &cancel); -- 2.30.2