aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/buildgraphloader.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-07-15 13:36:35 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-07-15 14:43:24 +0200
commitb515d24924bfa8a52c67522172ecf2291d9d95f5 (patch)
treeb8a08841de2529a4dd73ece3ba3a95aa75be3a27 /src/lib/corelib/buildgraph/buildgraphloader.h
parent471b0c93e128f5ac7998cdd22047438c72af9d6b (diff)
Refactor BuildGraphLoader::load().
Move the code that actually loads the project from a file into its own function. Change-Id: I258f97e8411a54e99fa274041f9054ce0703e273 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/buildgraphloader.h')
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h
index 48cf40abe..57285b62a 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.h
+++ b/src/lib/corelib/buildgraph/buildgraphloader.h
@@ -36,12 +36,12 @@
#include <buildgraph/artifactset.h>
#include <language/forward_decls.h>
#include <logging/logger.h>
+#include <tools/setupprojectparameters.h>
#include <QProcessEnvironment>
#include <QVariantMap>
namespace qbs {
-class SetupProjectParameters;
namespace Internal {
class FileDependency;
@@ -68,8 +68,8 @@ public:
const RulesEvaluationContextPtr &evalContext);
private:
- void trackProjectChanges(const SetupProjectParameters &parameters,
- const TopLevelProjectPtr &restoredProject, const QVariantMap &oldProjectConfig);
+ void loadBuildGraphFromDisk();
+ void trackProjectChanges(const TopLevelProjectPtr &restoredProject);
bool hasEnvironmentChanged(const TopLevelProjectConstPtr &restoredProject) const;
bool hasFileExistsResultChanged(const TopLevelProjectConstPtr &restoredProject) const;
bool hasFileLastModifiedResultChanged(const TopLevelProjectConstPtr &restoredProject) const;
@@ -117,6 +117,7 @@ private:
const AllRescuableArtifactData &existingRad);
RulesEvaluationContextPtr m_evalContext;
+ SetupProjectParameters m_parameters;
BuildGraphLoadResult m_result;
Logger m_logger;
QProcessEnvironment m_environment;