From f8f7931b43ad54b0ae659534f26c9af072ff2ce0 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 2 Feb 2017 11:14:36 +0100 Subject: [PATCH] QMakeProjectManager: Shorten ProVirtualFolderNode constructor It's only used in one code path, and the InternalNode contains everything it needs. Change-Id: I6bd4e2e3555b9a321bf0b93c56d5459f141be494 Reviewed-by: Oswald Buddenhagen Reviewed-by: Tim Jenssen --- .../qmakeprojectmanager/qmakenodes.cpp | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 83e7db373bd..30dcf659461 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -263,14 +263,12 @@ private: class ProVirtualFolderNode : public VirtualFolderNode { public: - ProVirtualFolderNode(const Utils::FileName &folderPath, int priority, const QString &typeName); + ProVirtualFolderNode(InternalNode *node); QString displayName() const final { return m_typeName; } QString addFileFilter() const final { return m_addFileFilter; } QString tooltip() const final { return QString(); } - void setAddFileFilter(const QString &filter) { m_addFileFilter = filter; } - private: QString m_typeName; QString m_addFileFilter; @@ -382,14 +380,10 @@ struct InternalNode FolderNode *createFolderNode(InternalNode *node) { FolderNode *newNode = 0; - if (node->typeName.isEmpty()) { + if (node->typeName.isEmpty()) newNode = new FolderNode(FileName::fromString(node->fullPath)); - } else { - auto n = new ProVirtualFolderNode(FileName::fromString(node->fullPath), - node->priority, node->typeName); - n->setAddFileFilter(node->addFileFilter); - newNode = n; - } + else + newNode = new ProVirtualFolderNode(node); newNode->setDisplayName(node->displayName); if (!node->icon.isNull()) @@ -440,9 +434,11 @@ struct InternalNode } }; -ProVirtualFolderNode::ProVirtualFolderNode(const FileName &folderPath, int priority, const QString &typeName) - : VirtualFolderNode(folderPath, priority), m_typeName(typeName) -{ } +ProVirtualFolderNode::ProVirtualFolderNode(InternalNode *node) + : VirtualFolderNode(FileName::fromString(node->fullPath), node->priority), + m_typeName(node->typeName), + m_addFileFilter(node->addFileFilter) +{} } // Internal