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

ProjectExplorer: Introduce some FolderNode convenience functions

Browse Source 
... and use them.

Change-Id: I9f5237e5eac30715c2effbd3301dd2a70516d2a9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-01-26 17:02:16 +01:00
parent 8427932a0e
commit 87304b3ce0
8 changed files with 117 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -453,7 +453,6 @@ struct InternalNode
existingFolderNodes.insert(node->filePath().toString(), node);
QList<FolderNode *> foldersToRemove;
QList<FolderNode *> foldersToAdd;
typedef QPair<InternalNode *, FolderNode *> NodePair;
QList<NodePair> nodesToUpdate;
@@ -480,7 +479,7 @@ struct InternalNode
nodesToUpdate << NodePair(*it, *oldit);
} else {
FolderNode *newNode = createFolderNode(*it);
foldersToAdd << newNode;
folder->addFolderNode(newNode);
nodesToUpdate << NodePair(*it, newNode);
}
}
@@ -506,7 +505,7 @@ struct InternalNode
nodesToUpdate << NodePair(it.value(), *oldit);
} else {
FolderNode *newNode = createFolderNode(it.value());
foldersToAdd << newNode;
folder->addFolderNode(newNode);
nodesToUpdate << NodePair(it.value(), newNode);
}
}
@@ -524,8 +523,6 @@ struct InternalNode
if (!foldersToRemove.isEmpty())
folder->removeFolderNodes(foldersToRemove);
if (!foldersToAdd.isEmpty())
folder->addFolderNodes(foldersToAdd);
foreach (const NodePair &np, nodesToUpdate)
np.first->updateSubFolders(np.second);
@@ -582,7 +579,7 @@ struct InternalNode
dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(fn)->update();
}
};
}
} // Internal
QStringList QmakePriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir, const QString &buildDir)
{
@@ -701,7 +698,7 @@ void QmakePriFileNode::update(const Internal::PriFileEvalResult &result)
{
// add project file node
if (m_fileNodes.isEmpty())
addFileNodes(QList<FileNode *>() << new FileNode(m_projectFilePath, FileType::Project, false));
addFileNode(new FileNode(m_projectFilePath, FileType::Project, false));
m_recursiveEnumerateFiles = result.recursiveEnumerateFiles;
watchFolders(result.folders.toSet());