diff options
| author | Marc Mutz <[email protected]> | 2022-10-06 11:08:21 +0200 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2022-10-11 23:17:18 +0200 |
| commit | aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch) | |
| tree | be5e1a9733987aed8602eb47618cd1673a594570 /src/opengl/qopenglshaderprogram.cpp | |
| parent | fd2685c2f0a219c091e028a98ba6cdd154986fec (diff) | |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace, with manual
unstaging of the actual definition and documentation in dist/,
src/corelib/doc/ and src/corelib/global/.
Task-number: QTBUG-99313
Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541
Reviewed-by: Ivan Solovev <[email protected]>
Diffstat (limited to 'src/opengl/qopenglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qopenglshaderprogram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp index 6dab8ed70a1..fb33bf0d5c1 100644 --- a/src/opengl/qopenglshaderprogram.cpp +++ b/src/opengl/qopenglshaderprogram.cpp @@ -1230,7 +1230,7 @@ void QOpenGLShaderProgram::removeAllShaders() { Q_D(QOpenGLShaderProgram); d->removingShaders = true; - for (QOpenGLShader *shader : qAsConst(d->shaders)) { + for (QOpenGLShader *shader : std::as_const(d->shaders)) { if (d->programGuard && d->programGuard->id() && shader && shader->d_func()->shaderGuard) { @@ -3727,7 +3727,7 @@ bool QOpenGLShaderProgramPrivate::isCacheDisabled() const bool QOpenGLShaderProgramPrivate::compileCacheable() { Q_Q(QOpenGLShaderProgram); - for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) { + for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : std::as_const(binaryProgram.shaders)) { auto s = std::make_unique<QOpenGLShader>(qt_shaderStageToType(shader.stage), q); if (!s->compileSourceCode(shader.source)) { log = s->log(); |
