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

ProjectExplorer: Remove FileNode's isGenerated constructor bool

Browse Source 
Use setter of base class, similar to setListInProject() before.

Change-Id: Id620f0084a5dec0410f29c80f8f6393a6bcd5050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2019-02-25 12:08:58 +01:00
parent 15673b6eca
commit 09372918c1
20 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -236,10 +236,9 @@ static bool supportsNodeAction(ProjectAction action, const Node *node)
QbsFileNode::QbsFileNode(const Utils::FileName &filePath,
const ProjectExplorer::FileType fileType,
bool generated,
int line) :
ProjectExplorer::FileNode(filePath, fileType, generated, line)
{ }
ProjectExplorer::FileNode(filePath, fileType, line, QByteArray{})
{}
QString QbsFileNode::displayName() const
{

2
src/plugins/qbsprojectmanager/qbsnodes.h
View File

@@ -42,7 +42,7 @@ class QbsProject;
class QbsFileNode : public ProjectExplorer::FileNode
{
public:
QbsFileNode(const Utils::FileName &filePath, const ProjectExplorer::FileType fileType, bool generated,
QbsFileNode(const Utils::FileName &filePath, const ProjectExplorer::FileType fileType,
int line);
QString displayName() const override;

11
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -73,7 +73,8 @@ void setupArtifacts(ProjectExplorer::FolderNode *root, const QList<qbs::Artifact
QLatin1String("linkerscript"),
QLatin1String("qrc"), QLatin1String("java.java")
};
auto node = std::make_unique<ProjectExplorer::FileNode>(path, type, isGenerated);
auto node = std::make_unique<ProjectExplorer::FileNode>(path, type);
node->setIsGenerated(isGenerated);
node->setListInProject(!isGenerated || ad.fileTags().toSet().intersects(sourceTags));
root->addNestedNode(std::move(node));
}
@@ -93,7 +94,7 @@ buildGroupNodeTree(const qbs::GroupData &grp, const QString &productPath, bool p
result->setDisplayName(grp.name());
result->addNode(std::make_unique<QbsProjectManager::Internal::QbsFileNode>(
Utils::FileName::fromString(grp.location().filePath()),
ProjectExplorer::FileType::Project, false,
ProjectExplorer::FileType::Project,
grp.location().line()));
::setupArtifacts(result.get(), grp.allSourceArtifacts());
@@ -114,7 +115,7 @@ void setupQbsProductData(QbsProjectManager::Internal::QbsProductNode *node,
// Add QbsFileNode:
node->addNode(std::make_unique<QbsFileNode>(Utils::FileName::fromString(prd.location().filePath()),
ProjectExplorer::FileType::Project, false,
ProjectExplorer::FileType::Project,
prd.location().line()));
@@ -150,7 +151,7 @@ void setupProjectNode(QbsProjectManager::Internal::QbsProjectNode *node, const q
{
using namespace QbsProjectManager::Internal;
node->addNode(std::make_unique<QbsFileNode>(Utils::FileName::fromString(prjData.location().filePath()),
ProjectExplorer::FileType::Project, false,
ProjectExplorer::FileType::Project,
prjData.location().line()));
foreach (const qbs::ProjectData &subData, prjData.subProjects()) {
auto subProject =
@@ -222,7 +223,7 @@ std::unique_ptr<QbsRootProjectNode> QbsNodeTreeBuilder::buildTree(QbsProject *pr
for (const QString &f : files) {
const Utils::FileName filePath = Utils::FileName::fromString(f);
if (filePath.isChildOf(base))
buildSystemFiles->addNestedNode(std::make_unique<ProjectExplorer::FileNode>(filePath, ProjectExplorer::FileType::Project, false));
buildSystemFiles->addNestedNode(std::make_unique<ProjectExplorer::FileNode>(filePath, ProjectExplorer::FileType::Project));
}
buildSystemFiles->compress();
root->addNode(std::move(buildSystemFiles));