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

ProjectExplorer: Replace a use of Node::nodeType()

Browse Source 
Change-Id: Ic586f6c4f436e871381f0e037028aed8a2fbf2c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-03-01 10:37:14 +01:00
parent bceae5b2a9
commit 8983185405
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -616,8 +616,12 @@ void FolderNode::addNestedNodes(std::vector<std::unique_ptr<FileNode> > &&files,
void FolderNode::compress()
{
if (auto subFolder = m_nodes.size() == 1 ? m_nodes.at(0)->asFolderNode() : nullptr) {
if (subFolder->nodeType() != nodeType())
const bool sameType = (isFolderNodeType() && subFolder->isFolderNodeType())
|| (isProjectNodeType() && subFolder->isProjectNodeType())
|| (isVirtualFolderType() && subFolder->isVirtualFolderType());
if (!sameType)
return;
// Only one subfolder: Compress!
setDisplayName(QDir::toNativeSeparators(displayName() + "/" + subFolder->displayName()));
for (Node *n : subFolder->nodes()) {