Make the AccountState a construction argument of the Folder

This will help moving the SyncEngine construction in the constructor
and allow moving functionalities from Folder to SyncEngine or its
delegated objects.

1 files changed, 2 insertions, 11 deletions

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index a6a80bd47..62461740c 100644
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -14,6 +14,7 @@
 #include "selectivesyncdialog.h"
 #include "folder.h"
 #include "account.h"
+#include "excludedfiles.h"
 #include "networkjobs.h"
 #include "theme.h"
 #include "folderman.h"
@@ -176,21 +177,11 @@ void SelectiveSyncTreeView::slotUpdateDirectories(QStringList list)
         pathToRemove.append('/');
 
     // Check for excludes.
-    //
-    // We would like to use Folder::isFileExcluded, but the folder doesn't
-    // exist yet. So we just create one temporarily...
-    FolderDefinition def;
-    def.localPath = pathToRemove;
-    def.ignoreHiddenFiles = FolderMan::instance()->ignoreHiddenFiles();
-    Folder f(def);
     QMutableListIterator<QString> it(list);
     while (it.hasNext()) {
         it.next();
-        QString path = it.value();
-        path.remove(pathToRemove);
-        if (f.isFileExcludedRelative(path)) {
+        if (ExcludedFiles::instance().isExcluded(it.value(), pathToRemove, FolderMan::instance()->ignoreHiddenFiles()))
             it.remove();
-        }
     }
 
     // Since / cannot be in the blacklist, expand it to the actual