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

QMakeProjectManager: Shorten ProVirtualFolderNode constructor

Browse Source 
It's only used in one code path, and the InternalNode contains
everything it needs.

Change-Id: I6bd4e2e3555b9a321bf0b93c56d5459f141be494
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
hjk
2017-02-02 11:14:36 +01:00
parent 31d6c3cd05
commit f8f7931b43
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,14 +263,12 @@ private:
class ProVirtualFolderNode : public VirtualFolderNode class ProVirtualFolderNode : public VirtualFolderNode
{ {
public: public:
ProVirtualFolderNode(const Utils::FileName &folderPath, int priority, const QString &typeName); ProVirtualFolderNode(InternalNode *node);
QString displayName() const final { return m_typeName; } QString displayName() const final { return m_typeName; }
QString addFileFilter() const final { return m_addFileFilter; } QString addFileFilter() const final { return m_addFileFilter; }
QString tooltip() const final { return QString(); } QString tooltip() const final { return QString(); }
void setAddFileFilter(const QString &filter) { m_addFileFilter = filter; }
private: private:
QString m_typeName; QString m_typeName;
QString m_addFileFilter; QString m_addFileFilter;
@@ -382,14 +380,10 @@ struct InternalNode
FolderNode *createFolderNode(InternalNode *node) FolderNode *createFolderNode(InternalNode *node)
{ {
FolderNode *newNode = 0; FolderNode *newNode = 0;
if (node->typeName.isEmpty()) { if (node->typeName.isEmpty())
newNode = new FolderNode(FileName::fromString(node->fullPath)); newNode = new FolderNode(FileName::fromString(node->fullPath));
} else { else
auto n = new ProVirtualFolderNode(FileName::fromString(node->fullPath), newNode = new ProVirtualFolderNode(node);
node->priority, node->typeName);
n->setAddFileFilter(node->addFileFilter);
newNode = n;
}
newNode->setDisplayName(node->displayName); newNode->setDisplayName(node->displayName);
if (!node->icon.isNull()) if (!node->icon.isNull())
@@ -440,9 +434,11 @@ struct InternalNode
} }
}; };
ProVirtualFolderNode::ProVirtualFolderNode(const FileName &folderPath, int priority, const QString &typeName) ProVirtualFolderNode::ProVirtualFolderNode(InternalNode *node)
: VirtualFolderNode(folderPath, priority), m_typeName(typeName) : VirtualFolderNode(FileName::fromString(node->fullPath), node->priority),
{ } m_typeName(node->typeName),
m_addFileFilter(node->addFileFilter)
{}
} // Internal } // Internal