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

QbsProject: Use base Project::isParsing() function

Browse Source 
While the base function is not virtual the "hiding" re-implementation
effectively appears to do the same. So drop it.

Change-Id: I4ab0e0690b948ce3f590c87262d10622b169450e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-12-20 14:28:43 +01:00
parent 91530a3e0c
commit 63ed6321fb
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -144,7 +144,7 @@ QbsBuildStep::~QbsBuildStep()
bool QbsBuildStep::init(QList<const BuildStep *> &earlierSteps) bool QbsBuildStep::init(QList<const BuildStep *> &earlierSteps)
{ {
Q_UNUSED(earlierSteps); Q_UNUSED(earlierSteps);
if (static_cast<QbsProject *>(project())->isParsing() || m_job) if (project()->isParsing() || m_job)
return false; return false;
QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration()); QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration());

2
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -66,7 +66,7 @@ QbsCleanStep::~QbsCleanStep()
bool QbsCleanStep::init(QList<const BuildStep *> &earlierSteps) bool QbsCleanStep::init(QList<const BuildStep *> &earlierSteps)
{ {
Q_UNUSED(earlierSteps); Q_UNUSED(earlierSteps);
if (static_cast<QbsProject *>(project())->isParsing() || m_job) if (project()->isParsing() || m_job)
return false; return false;
QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration()); QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration());

2
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -82,7 +82,7 @@ QbsInstallStep::~QbsInstallStep()
bool QbsInstallStep::init(QList<const BuildStep *> &earlierSteps) bool QbsInstallStep::init(QList<const BuildStep *> &earlierSteps)
{ {
Q_UNUSED(earlierSteps); Q_UNUSED(earlierSteps);
QTC_ASSERT(!static_cast<QbsProject *>(project())->isParsing() && !m_job, return false); QTC_ASSERT(!project()->isParsing() && !m_job, return false);
return true; return true;
} }

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

@@ -405,11 +405,6 @@ QString QbsProject::profileForTarget(const Target *t) const
return QbsManager::profileForKit(t->kit()); return QbsManager::profileForKit(t->kit());
} }
bool QbsProject::isParsing() const
{
return m_qbsUpdateFutureInterface;
}
bool QbsProject::hasParseResult() const bool QbsProject::hasParseResult() const
{ {
return qbsProject().isValid(); return qbsProject().isValid();

1
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -86,7 +86,6 @@ public:
static ProjectExplorer::FileType fileTypeFor(const QSet<QString> &tags); static ProjectExplorer::FileType fileTypeFor(const QSet<QString> &tags);
QString profileForTarget(const ProjectExplorer::Target *t) const; QString profileForTarget(const ProjectExplorer::Target *t) const;
bool isParsing() const;
bool hasParseResult() const; bool hasParseResult() const;
void parseCurrentBuildConfiguration(); void parseCurrentBuildConfiguration();
void scheduleParsing() { m_parsingScheduled = true; } void scheduleParsing() { m_parsingScheduled = true; }