Utils: Introduce FileSystemWatcher.

Remove duplicated classes ProjectExplorer::FileWatcher
and QmlProjectManager::FileSystemWatcher, create
Utils::FileSystemWatcher from them, merging the functionality.

Also use in HelpManager/Maemo, reducing the number
of QFileSystemWatcher instances (and thus, shutdown time).

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 090a834900d..9e8c3eaddfe 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -45,8 +45,8 @@ namespace QmlJS {
 class ModelManagerInterface;
 }
 
-namespace ProjectExplorer {
-class FileWatcher;
+namespace Utils {
+class FileSystemWatcher;
 }
 
 namespace QmlProjectManager {
@@ -125,7 +125,7 @@ private:
     // qml based, new format
     QDeclarativeEngine m_engine;
     QWeakPointer<QmlProjectItem> m_projectItem;
-    ProjectExplorer::FileWatcher *m_fileWatcher;
+    Utils::FileSystemWatcher *m_fileWatcher;
 
     Internal::QmlProjectNode *m_rootNode;
 };