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

Autotools: Be a bit more paranoid with pointers

Browse Source 
Change-Id: I61911287c88c9e13718b08af2542e9bcc6c4aa08
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-06 14:32:46 +02:00
parent abf2a634a0
commit 06a60b9ff8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -284,7 +284,7 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
FolderNode *parentFolder = 0;
FolderNode *oldParentFolder = 0;
foreach (const QString& file, files) {
foreach (const QString &file, files) {
if (file.endsWith(QLatin1String(".moc")))
continue;
@@ -306,8 +306,8 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
parentFolder = m_rootNode;
}
}
QTC_ASSERT(parentFolder != 0, return);
if ((oldParentFolder != parentFolder) && !fileNodes.isEmpty()) {
QTC_ASSERT(parentFolder, return);
if (oldParentFolder && (oldParentFolder != parentFolder) && !fileNodes.isEmpty()) {
// AutotoolsProjectNode::addFileNodes() is a very expensive operation. It is
// important to collect as much file nodes of the same parent folder as
// possible before invoking it.
@@ -328,7 +328,7 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
}
}
if (!fileNodes.isEmpty())
if (parentFolder && !fileNodes.isEmpty())
parentFolder->addFileNodes(fileNodes);
// Remove unused file nodes and empty folder nodes