aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/api/jobs.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-07-15 17:10:24 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-07-16 10:57:45 +0200
commit6fa9b0ed23e8a74066438c9a707d5ec24b8051a4 (patch)
tree41ab55b195154d098034be496a8b93fa4738a3d9 /src/lib/corelib/api/jobs.cpp
parent42beadbf28523c96e0790631a4e294de0e9b3f03 (diff)
Rename "lockBuildGraph" to "lockProject".
To distinguish this lock better from the build graph file lock. Change-Id: Ib520bea568c5f9bf0ea5c87347f5576d82c935c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/api/jobs.cpp')
-rw-r--r--src/lib/corelib/api/jobs.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp
index a249d568a..7c30c39e2 100644
--- a/src/lib/corelib/api/jobs.cpp
+++ b/src/lib/corelib/api/jobs.cpp
@@ -115,7 +115,7 @@ AbstractJob::AbstractJob(InternalJob *internalJob, QObject *parent)
m_state = StateRunning;
}
-bool AbstractJob::lockBuildGraph(const TopLevelProjectPtr &project)
+bool AbstractJob::lockProject(const TopLevelProjectPtr &project)
{
// The API is not thread-safe, so we don't need a mutex here, as the API requests come in
// synchronously.
@@ -130,7 +130,7 @@ bool AbstractJob::lockBuildGraph(const TopLevelProjectPtr &project)
return true;
}
-void AbstractJob::unlockBuildGraph()
+void AbstractJob::unlockProject()
{
if (!m_project)
return;
@@ -188,7 +188,7 @@ void AbstractJob::handleFinished()
{
QBS_ASSERT(m_state != StateFinished, return);
m_state = StateFinished;
- unlockBuildGraph();
+ unlockProject();
emit finished(!error().hasError(), this);
}
@@ -280,7 +280,7 @@ BuildJob::BuildJob(const Logger &logger, QObject *parent)
void BuildJob::build(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products,
const BuildOptions &options)
{
- if (!lockBuildGraph(project))
+ if (!lockProject(project))
return;
qobject_cast<InternalBuildJob *>(internalJob())->build(project, products, options);
}
@@ -299,7 +299,7 @@ CleanJob::CleanJob(const Logger &logger, QObject *parent)
void CleanJob::clean(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products,
const qbs::CleanOptions &options)
{
- if (!lockBuildGraph(project))
+ if (!lockProject(project))
return;
InternalJobThreadWrapper * wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob());
qobject_cast<InternalCleanJob *>(wrapper->synchronousJob())->init(project, products, options);
@@ -319,7 +319,7 @@ InstallJob::InstallJob(const Logger &logger, QObject *parent)
void InstallJob::install(const TopLevelProjectPtr &project,
const QList<ResolvedProductPtr> &products, const InstallOptions &options)
{
- if (!lockBuildGraph(project))
+ if (!lockProject(project))
return;
InternalJobThreadWrapper *wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob());
InternalInstallJob *installJob = qobject_cast<InternalInstallJob *>(wrapper->synchronousJob());