diff options
| author | hjk <hjk@qt.io> | 2019-03-01 10:37:14 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-03-01 10:08:51 +0000 |
| commit | 89831854059144613279affc4c37eb65dbcbf6e7 (patch) | |
| tree | 5640551e883c4884fb773c172263d8c5f64fcc5f | |
| parent | bceae5b2a90cf78502ac324adbc9613cfd2dcb23 (diff) | |
ProjectExplorer: Replace a use of Node::nodeType()
Change-Id: Ic586f6c4f436e871381f0e037028aed8a2fbf2c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/projectnodes.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 3b1d7c049b..1b694aa85c 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -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()) { |