Todo: Fix thread safety issue in CppTodoItemScanner

Replace the not thread safe Project::files() with the thread safe
CppModelManager::projectPart() to find out whether a file belongs to a
project or not.

Task-number: QTCREATORBUG-12556
Change-Id: Icf443b5b31c818fc15738aa365562db12439d8d7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index f4f9e7b4bd..5ff7d14907 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -45,17 +45,6 @@ CppTodoItemsScanner::CppTodoItemsScanner(const KeywordList &keywordList, QObject
         SLOT(documentUpdated(CPlusPlus::Document::Ptr)), Qt::DirectConnection);
 }
 
-bool CppTodoItemsScanner::shouldProcessFile(const QString &fileName)
-{
-    CppTools::CppModelManagerInterface *modelManager = CppTools::CppModelManagerInterface::instance();
-
-    foreach (const CppTools::CppModelManagerInterface::ProjectInfo &info, modelManager->projectInfos())
-        if (info.project().data()->files(ProjectExplorer::Project::ExcludeGeneratedFiles).contains(fileName))
-            return true;
-
-    return false;
-}
-
 void CppTodoItemsScanner::keywordListChanged()
 {
     // We need to rescan everything known to the code model
@@ -72,7 +61,8 @@ void CppTodoItemsScanner::keywordListChanged()
 
 void CppTodoItemsScanner::documentUpdated(CPlusPlus::Document::Ptr doc)
 {
-    if (shouldProcessFile(doc->fileName()))
+    CppTools::CppModelManagerInterface *modelManager = CppTools::CppModelManagerInterface::instance();
+    if (!modelManager->projectPart(doc->fileName()).isEmpty())
         processDocument(doc);
 }