From 5ed7728d464ea5e9e7887e5e1a0fe840d89384e7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 20 Feb 2017 11:49:32 +0100 Subject: [PATCH] Qbs: Simplify QbsProjectNode Change-Id: I463407a38ed9acfc1332cbeb7cdc37f709c724d9 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsnodes.cpp | 15 +++++---------- src/plugins/qbsprojectmanager/qbsnodes.h | 2 -- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index 002a0a98839..2967dbc1bc8 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -587,7 +587,11 @@ QbsGroupNode *QbsProductNode::findGroupNode(const QString &name) QbsProjectNode::QbsProjectNode(const Utils::FileName &path) : QbsBaseProjectNode(path) { - ctor(); + if (m_projectIcon.isNull()) + m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT)); + + setIcon(m_projectIcon); + addNode(new ProjectExplorer::FileNode(filePath(), ProjectExplorer::FileType::Project, false)); } QbsProjectNode::~QbsProjectNode() @@ -630,15 +634,6 @@ bool QbsProjectNode::showInSimpleTree() const return true; } -void QbsProjectNode::ctor() -{ - if (m_projectIcon.isNull()) - m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT)); - - setIcon(m_projectIcon); - addNode(new ProjectExplorer::FileNode(filePath(), ProjectExplorer::FileType::Project, false)); -} - // -------------------------------------------------------------------- // QbsRootProjectNode: // -------------------------------------------------------------------- diff --git a/src/plugins/qbsprojectmanager/qbsnodes.h b/src/plugins/qbsprojectmanager/qbsnodes.h index aad777401e0..8cd19573ad0 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.h +++ b/src/plugins/qbsprojectmanager/qbsnodes.h @@ -163,8 +163,6 @@ protected: void update(const qbs::Project &qbsProject, const qbs::ProjectData &prjData); private: - void ctor(); - static QIcon m_projectIcon; qbs::ProjectData m_projectData; };