diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-12-05 10:21:38 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-05 16:45:35 +0100 |
| commit | 8312afe19a5e839e33b59c5fd5952fbf2a9a612e (patch) | |
| tree | 85cc384f3c719bb929f37a91ade0c729fb122960 /src/lib/buildgraph/rulesapplicator.cpp | |
| parent | 8fe229f85afb621c7b3dfe575a19518802bd4d41 (diff) | |
| download | qbs-8312afe19a5e839e33b59c5fd5952fbf2a9a612e.tar.gz | |
Remove the BuildGraph class.
Its only contents were static member functions, which now become free
functions.
Change-Id: If854e6804626beddcc918d0aea155e07fd945577
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/rulesapplicator.cpp')
| -rw-r--r-- | src/lib/buildgraph/rulesapplicator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/buildgraph/rulesapplicator.cpp b/src/lib/buildgraph/rulesapplicator.cpp index 7f62f1297..ab3771685 100644 --- a/src/lib/buildgraph/rulesapplicator.cpp +++ b/src/lib/buildgraph/rulesapplicator.cpp @@ -62,7 +62,7 @@ void RulesApplicator::applyAllRules() void RulesApplicator::applyRule(const RuleConstPtr &rule) { m_rule = rule; - BuildGraph::setupScriptEngineForProduct(engine(), m_buildProduct->rProduct, m_rule, scope()); + setupScriptEngineForProduct(engine(), m_buildProduct->rProduct, m_rule, scope()); Q_ASSERT_X(scope().property("product").strictlyEquals(engine()->evaluate("product")), "BG", "Product object is not in current scope."); @@ -89,7 +89,7 @@ void RulesApplicator::doApply(const ArtifactList &inputArtifacts) if (qbsLogLevel(LoggerDebug)) qbsDebug() << "[BG] apply rule " << m_rule->toString() << " " - << BuildGraph::toStringList(inputArtifacts).join(",\n "); + << toStringList(inputArtifacts).join(",\n "); QList<QPair<const RuleArtifact *, Artifact *> > ruleArtifactArtifactMap; QList<Artifact *> outputArtifacts; @@ -126,14 +126,14 @@ void RulesApplicator::doApply(const ArtifactList &inputArtifacts) // connect artifacts that match the file tags in explicitlyDependsOn foreach (const QString &fileTag, m_rule->explicitlyDependsOn) foreach (Artifact *dependency, m_artifactsPerFileTag.value(fileTag)) - BuildGraph::loggedConnect(outputArtifact, dependency); + loggedConnect(outputArtifact, dependency); // Transformer setup for (ArtifactList::const_iterator it = usingArtifacts.constBegin(); it != usingArtifacts.constEnd(); ++it) { Artifact *dep = *it; - BuildGraph::loggedConnect(outputArtifact, dep); + loggedConnect(outputArtifact, dep); m_transformer->inputs.insert(dep); } m_transformer->outputs.insert(outputArtifact); @@ -225,7 +225,7 @@ Artifact *RulesApplicator::createOutputArtifact(const RuleArtifactConstPtr &rule // This can happen when applying rules after scanning for additional file tags. // We just regenerate the transformer. if (qbsLogLevel(LoggerTrace)) - qbsTrace("[BG] regenerating transformer for '%s'", qPrintable(BuildGraph::fileName(outputArtifact))); + qbsTrace("[BG] regenerating transformer for '%s'", qPrintable(relativeArtifactFileName(outputArtifact))); m_transformer = outputArtifact->transformer; m_transformer->inputs.unite(inputArtifacts); @@ -269,7 +269,7 @@ Artifact *RulesApplicator::createOutputArtifact(const RuleArtifactConstPtr &rule foreach (Artifact *inputArtifact, inputArtifacts) { Q_ASSERT(outputArtifact != inputArtifact); - BuildGraph::loggedConnect(outputArtifact, inputArtifact); + loggedConnect(outputArtifact, inputArtifact); } // create transformer if not already done so |
