Qt4Project: Do not trigger updateCodeModels on folderChanged

This reverts commit 2fdb70bdce77ec0b60847623579af72ddc58da91.
Be smarter about what to do on folder changes. Trigger at most
one codemodel update per folder change signal. (Thus still fixing
the original problem 2fdb70b fixed.) And only trigger one if the
actual file list changes. This could be further optimized to only
tell the code model about the new files, but that's for another
patch.

Task-number: QTCREATORBUG-9697
Change-Id: I78d134663f1455254caf812c27c048d4f0828242
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 18 insertions, 5 deletions

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 4ba2a96919..a5ba933926 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -146,7 +146,7 @@ class CentralizedFolderWatcher : public QObject
 {
     Q_OBJECT
 public:
-    CentralizedFolderWatcher(QObject *parent);
+    CentralizedFolderWatcher(Qt4Project *parent);
     ~CentralizedFolderWatcher();
     void watchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
     void unwatchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
@@ -157,6 +157,7 @@ private slots:
     void delayedFolderChanged(const QString &folder);
 
 private:
+    Qt4Project *m_project;
     QSet<QString> recursiveDirs(const QString &folder);
     QFileSystemWatcher m_watcher;
     QMultiMap<QString, Qt4ProjectManager::Qt4PriFileNode *> m_map;
@@ -1215,7 +1216,8 @@ namespace {
     bool debugCFW = false;
 }
 
-CentralizedFolderWatcher::CentralizedFolderWatcher(QObject *parent) : QObject(parent)
+CentralizedFolderWatcher::CentralizedFolderWatcher(Qt4Project *parent)
+    : QObject(parent), m_project(parent)
 {
     m_compressTimer.setSingleShot(true);
     m_compressTimer.setInterval(200);
@@ -1337,12 +1339,19 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
 
     QString dir = folder;
     const QChar slash = QLatin1Char('/');
+    bool newOrRemovedFiles = false;
     while (true) {
         if (!dir.endsWith(slash))
             dir.append(slash);
         QList<Qt4ProjectManager::Qt4PriFileNode *> nodes = m_map.values(dir);
-        foreach (Qt4ProjectManager::Qt4PriFileNode *node, nodes) {
-            node->folderChanged(folder);
+        if (!nodes.isEmpty()) {
+            // Collect all the files
+            QSet<Utils::FileName> newFiles;
+            newFiles += Qt4PriFileNode::recursiveEnumerate(folder);
+            foreach (Qt4ProjectManager::Qt4PriFileNode *node, nodes) {
+                newOrRemovedFiles = newOrRemovedFiles
+                        || node->folderChanged(folder, newFiles);
+            }
         }
 
         // Chop off last part, and break if there's nothing to chop off
@@ -1357,7 +1366,6 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
         dir.truncate(index + 1);
     }
 
-
     QString folderWithSlash = folder;
     if (!folder.endsWith(slash))
         folderWithSlash.append(slash);
@@ -1374,6 +1382,11 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
             m_watcher.addPaths(tmp.toList());
         m_recursiveWatchedFolders += tmp;
     }
+
+    if (newOrRemovedFiles) {
+        m_project->updateFileList();
+        m_project->updateCodeModels();
+    }
 }
 
 bool Qt4Project::needsConfiguration() const