Folder: Move FolderWatcher to Folder

This makes it unnecessary for FolderMan to manage the list and removes
the need for some forwarders.

This is done in preparation for follow-up commits that want to add
diagnostics to FolderWatcher that shall be available from within Folder.

1 files changed, 3 insertions, 7 deletions

diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 5802789c8..002fb9b45 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -109,9 +109,6 @@ public:
 
     static SyncResult accountStatus(const QList<Folder *> &folders);
 
-    void removeMonitorPath(const QString &alias, const QString &path);
-    void addMonitorPath(const QString &alias, const QString &path);
-
     // Escaping of the alias which is used in QSettings AND the file
     // system, thus need to be escaped.
     static QString escapeAlias(const QString &);
@@ -284,7 +281,9 @@ private:
     // finds all folder configuration files
     // and create the folders
     QString getBackupName(QString fullPathName) const;
-    void registerFolderMonitor(Folder *folder);
+
+    // makes the folder known to the socket api
+    void registerFolderWithSocketApi(Folder *folder);
 
     // restarts the application (Linux only)
     void restartApplication();
@@ -298,9 +297,6 @@ private:
     QPointer<Folder> _lastSyncFolder;
     bool _syncEnabled;
 
-    /// Watching for file changes in folders
-    QMap<QString, FolderWatcher *> _folderWatchers;
-
     /// Starts regular etag query jobs
     QTimer _etagPollTimer;
     /// The currently running etag query