feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Assert that the filter passed to Project::files is valid

Browse Source 
QTC_ASSERT that the filter passed to Project::files is valid before
calling it.

Change-Id: I17776fa4ab3e2aa21ac34db015fdbbb382439669
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-22 11:05:42 +02:00
parent b98596490e
commit 14b1b3137b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/project.cpp
View File

@@ -607,13 +607,15 @@ Project::RestoreResult Project::restoreSettings(QString *errorMessage)
*/ */
Utils::FilePathList Project::files(const Project::NodeMatcher &filter) const Utils::FilePathList Project::files(const Project::NodeMatcher &filter) const
{ {
QTC_ASSERT(filter, return {});
Utils::FilePathList result; Utils::FilePathList result;
if (d->m_sortedNodeList.empty() && filter(containerNode())) if (d->m_sortedNodeList.empty() && filter(containerNode()))
result.append(projectFilePath()); result.append(projectFilePath());
Utils::FilePath lastAdded; Utils::FilePath lastAdded;
for (const Node *n : qAsConst(d->m_sortedNodeList)) { for (const Node *n : qAsConst(d->m_sortedNodeList)) {
if (filter && !filter(n)) if (!filter(n))
continue; continue;
// Remove duplicates: // Remove duplicates: