diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-03-04 12:28:49 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-03-08 15:44:17 +0100 |
| commit | 034d8898f8166423db085da529787e56204c8e15 (patch) | |
| tree | f58e930c7880d1cd79cd39745ed366d27dcd9e55 /src/opengl/qopenglengineshadermanager.cpp | |
| parent | 87725ee75981ec9ab25456c41acc74681c85ae2e (diff) | |
Fix deprecated uses of QScopedPointer
By changing it to unique_ptr.
Pick-to: 6.2 6.3
Change-Id: I91abb69445b537d4c95983ae735341882352b29d
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/opengl/qopenglengineshadermanager.cpp')
| -rw-r--r-- | src/opengl/qopenglengineshadermanager.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/opengl/qopenglengineshadermanager.cpp b/src/opengl/qopenglengineshadermanager.cpp index eb2aa12d07..cf7424adb1 100644 --- a/src/opengl/qopenglengineshadermanager.cpp +++ b/src/opengl/qopenglengineshadermanager.cpp @@ -46,6 +46,7 @@ #include <QtCore/qthreadstorage.h> #include <algorithm> +#include <memory> #if defined(QT_DEBUG) #include <QMetaEnum> @@ -372,7 +373,7 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO } } - QScopedPointer<QOpenGLEngineShaderProg> newProg; + std::unique_ptr<QOpenGLEngineShaderProg> newProg; do { QByteArray fragSource; @@ -395,10 +396,10 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO vertexSource.append(qShaderSnippets[prog.mainVertexShader]); vertexSource.append(qShaderSnippets[prog.positionVertexShader]); #endif - QScopedPointer<QOpenGLShaderProgram> shaderProgram(new QOpenGLShaderProgram); + auto shaderProgram = std::make_unique<QOpenGLShaderProgram>(); CachedShader shaderCache(fragSource, vertexSource); - bool inCache = shaderCache.load(shaderProgram.data(), QOpenGLContext::currentContext()); + bool inCache = shaderCache.load(shaderProgram.get(), QOpenGLContext::currentContext()); if (!inCache) { if (!shaderProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource)) { @@ -446,7 +447,7 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO } newProg.reset(new QOpenGLEngineShaderProg(prog)); - newProg->program = shaderProgram.take(); + newProg->program = shaderProgram.release(); newProg->program->link(); if (newProg->program->isLinked()) { @@ -478,10 +479,10 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO } } - cachedPrograms.insert(0, newProg.data()); + cachedPrograms.insert(0, newProg.get()); } while (false); - return newProg.take(); + return newProg.release(); } void QOpenGLEngineSharedShaders::cleanupCustomStage(QOpenGLCustomShaderStage* stage) |