Move some FileSystemWatcher usages to FilePath

Change-Id: I72d24ae3f819e429009b0d7e42b21957f07cb00a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/libs/utils/filesystemwatcher.cpp

@@ -329,9 +329,9 @@ void FileSystemWatcher::removeFiles(const QStringList &files)
 void FileSystemWatcher::clear()
 {
     if (!d->m_files.isEmpty())
-        removeFiles(files());
+        removeFiles(filePaths());
     if (!d->m_directories.isEmpty())
-        removeDirectories(directories());
+        removeDirectories(directoryPaths());
 }
 
 QStringList FileSystemWatcher::files() const
@@ -381,9 +381,9 @@ void FileSystemWatcher::addDirectories(const QStringList &directories, WatchMode
         d->m_staticData->m_watcher->addPaths(toAdd);
 }
 
-void FileSystemWatcher::removeDirectory(const QString &directory)
+void FileSystemWatcher::removeDirectory(const FilePath &file)
 {
-    removeDirectories(QStringList(directory));
+    removeDirectories({file.toFSPathString()});
 }
 
 void FileSystemWatcher::removeDirectories(const QStringList &directories)
@@ -496,11 +496,6 @@ void FileSystemWatcher::addDirectories(const FilePaths &files, WatchMode wm)
     addDirectories(transform(files, &FilePath::toFSPathString), wm);
 }
 
-void FileSystemWatcher::removeDirectory(const FilePath &file)
-{
-    removeDirectory(file.toFSPathString());
-}
-
 void FileSystemWatcher::removeDirectories(const FilePaths &files)
 {
     removeDirectories(transform(files, &FilePath::toFSPathString));

src/libs/utils/filesystemwatcher.h

@@ -28,6 +28,8 @@ public:
     explicit FileSystemWatcher(int id, QObject *parent = nullptr);
     ~FileSystemWatcher() override;
 
+    void clear();
+
     // Good to use in new code:
     void addFile(const Utils::FilePath &file, WatchMode wm);
     void addFiles(const Utils::FilePaths &files, WatchMode wm);
@@ -55,15 +57,12 @@ public:
     void removeFile(const QString &file);
     void removeFiles(const QStringList &files);
 
-    void clear();
-
     bool watchesFile(const QString &file) const;
     QStringList files() const;
 
     void addDirectory(const QString &file, WatchMode wm);
     void addDirectories(const QStringList &files, WatchMode wm);
 
-    void removeDirectory(const QString &file);
     void removeDirectories(const QStringList &files);
 
     bool watchesDirectory(const QString &file) const;

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -345,8 +345,8 @@ void FileApiReader::startCMakeState(const QStringList &configurationArguments)
 
     qCDebug(cmakeFileApiMode) << ">>>>>> Running cmake with arguments:" << configurationArguments;
     // Reset watcher:
-    m_watcher.removeFiles(m_watcher.files());
-    m_watcher.removeDirectories(m_watcher.directories());
+    m_watcher.removeFiles(m_watcher.filePaths());
+    m_watcher.removeDirectories(m_watcher.directoryPaths());
 
     makeBackupConfiguration(true);
     writeConfigurationIntoBuildDirectory(configurationArguments);

src/plugins/genericprojectmanager/genericproject.cpp

@@ -158,7 +158,7 @@ private:
 
     CppEditor::CppProjectUpdaterInterface *m_cppCodeModelUpdater = nullptr;
 
-    Utils::FileSystemWatcher m_deployFileWatcher;
+    FileSystemWatcher m_deployFileWatcher;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -602,9 +602,9 @@ void GenericBuildSystem::updateDeploymentData()
         deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
                                                   projectDirectory().toString());
         setDeploymentData(deploymentData);
-        if (m_deployFileWatcher.files() != QStringList(deploymentFilePath.toString())) {
+        if (m_deployFileWatcher.filePaths() != FilePaths{deploymentFilePath}) {
             m_deployFileWatcher.clear();
-            m_deployFileWatcher.addFile(deploymentFilePath.toString(),
+            m_deployFileWatcher.addFile(deploymentFilePath,
                                         FileSystemWatcher::WatchModifiedDate);
         }
     }

src/plugins/mesonprojectmanager/mesonbuildsystem.cpp

@@ -185,8 +185,7 @@ void MesonBuildSystem::init()
     m_IntroWatcher.addFile(buildConfiguration()
                                ->buildDirectory()
                                .pathAppended(Constants::MESON_INFO_DIR)
-                               .pathAppended(Constants::MESON_INFO)
-                               .toString(),
+                               .pathAppended(Constants::MESON_INFO),
                            Utils::FileSystemWatcher::WatchModifiedDate);
 }
 

src/plugins/nim/project/nimbuildsystem.cpp

@@ -54,9 +54,9 @@ NimProjectScanner::NimProjectScanner(Project *project)
         }
 
         // Sync watched dirs
-        const QSet<QString> fsDirs = Utils::transform<QSet>(nodes,
-            [](const std::unique_ptr<FileNode> &fn) { return fn->directory().toString(); });
-        const QSet<QString> projectDirs = Utils::toSet(m_directoryWatcher.directories());
+        const QSet<FilePath> fsDirs = Utils::transform<QSet>(nodes,
+            [](const std::unique_ptr<FileNode> &fn) { return fn->directory(); });
+        const QSet<FilePath> projectDirs = Utils::toSet(m_directoryWatcher.directoryPaths());
         m_directoryWatcher.addDirectories(Utils::toList(fsDirs - projectDirs), FileSystemWatcher::WatchAllChanges);
         m_directoryWatcher.removeDirectories(Utils::toList(projectDirs - fsDirs));
 
@@ -98,7 +98,7 @@ void NimProjectScanner::startScan()
 
 void NimProjectScanner::watchProjectFilePath()
 {
-    m_directoryWatcher.addFile(m_project->projectFilePath().toString(), FileSystemWatcher::WatchModifiedDate);
+    m_directoryWatcher.addFile(m_project->projectFilePath(), FileSystemWatcher::WatchModifiedDate);
 }
 
 void NimProjectScanner::setExcludedFiles(const QStringList &list)

src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

@@ -157,9 +157,9 @@ void QmlPreviewConnectionManager::createPreviewClient()
                             bool success = false;
                             QByteArray contents = m_fileLoader(filename.toFSPathString(), &success);
                             if (success) {
-                                if (!m_fileSystemWatcher.watchesFile(filename.toFSPathString())) {
+                                if (!m_fileSystemWatcher.watchesFile(filename)) {
                                     m_fileSystemWatcher
-                                        .addFile(filename.toFSPathString(),
+                                        .addFile(filename,
                                                  Utils::FileSystemWatcher::WatchModifiedDate);
                                 }
                                 m_qmlPreviewClient->announceFile(path, contents);

src/plugins/qtsupport/qtversionmanager.cpp

@@ -127,8 +127,7 @@ void QtVersionManager::triggerQtVersionRestore()
         m_configFileWatcher = new FileSystemWatcher(m_instance);
         connect(m_configFileWatcher, &FileSystemWatcher::fileChanged,
                 m_fileWatcherTimer, QOverload<>::of(&QTimer::start));
-        m_configFileWatcher->addFile(configFileName.toString(),
-                                     FileSystemWatcher::WatchModifiedDate);
+        m_configFileWatcher->addFile(configFileName, FileSystemWatcher::WatchModifiedDate);
     } // exists
 
     const QtVersions vs = versions();
@@ -226,8 +225,8 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
     const FilePath path = globalSettingsFileName();
     // Handle overwritting of data:
     if (m_configFileWatcher) {
-        m_configFileWatcher->removeFile(path.toString());
-        m_configFileWatcher->addFile(path.toString(), FileSystemWatcher::WatchModifiedDate);
+        m_configFileWatcher->removeFile(path);
+        m_configFileWatcher->addFile(path, FileSystemWatcher::WatchModifiedDate);
     }
 
     QList<int> added;