diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-05-10 01:25:19 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-23 16:50:08 +0000 |
commit | 20149803a44856ea25063077964c1159b6d7a078 (patch) | |
tree | 4cd0b818e1fbe5861095d7acd516451322570bc6 /src/lib/corelib/api/internaljobs.cpp | |
parent | 41595d0cf8ac00416a3a8a437eedde2715f75500 (diff) | |
download | qbs-20149803a44856ea25063077964c1159b6d7a078.tar.gz |
Replace QSharedPointer/QWeakPointer with std::shared_ptr/std::weak_ptr
Change-Id: I2915c578968bed425a8d8b617b56df88ed3f2882
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/api/internaljobs.cpp')
-rw-r--r-- | src/lib/corelib/api/internaljobs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index 349d93834..54ce7bfe1 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -248,7 +248,7 @@ void InternalSetupProjectJob::start() const QString buildDir = TopLevelProject::deriveBuildDirectory(m_parameters.buildRoot(), projectId); if (m_existingProject && m_existingProject->buildDirectory != buildDir) - m_existingProject.clear(); + m_existingProject.reset(); if (!m_existingProject) { bgLocker = new BuildGraphLocker(ProjectBuildData::deriveBuildGraphFilePath(buildDir, projectId), @@ -261,7 +261,7 @@ void InternalSetupProjectJob::start() m_newProject->bgLocker = bgLocker; deleteLocker = false; } catch (const ErrorInfo &error) { - m_newProject.clear(); + m_newProject.reset(); setError(error); // Delete the build graph locker if and only if we allocated it here. @@ -303,7 +303,7 @@ void InternalSetupProjectJob::execute() storeBuildGraph(m_newProject); // The evalutation context cannot be re-used for building, which runs in a different thread. - m_newProject->buildData->evaluationContext.clear(); + m_newProject->buildData->evaluationContext.reset(); } void InternalSetupProjectJob::resolveProjectFromScratch(ScriptEngine *engine) @@ -386,7 +386,7 @@ void InternalBuildJob::build(const TopLevelProjectPtr &project, void InternalBuildJob::handleFinished() { setError(m_executor->error()); - project()->buildData->evaluationContext.clear(); + project()->buildData->evaluationContext.reset(); storeBuildGraph(); m_executor->deleteLater(); } |