diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-25 10:42:03 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-04-26 07:00:43 +0000 |
commit | c1db1788c0471d371b25733fffd19ae2c8631a23 (patch) | |
tree | aa07b157cc53f257854d25e30b9523aecafa8cfe /src/opengl/qopengltextureglyphcache.cpp | |
parent | 1ed449e168af133184633d174fd7339a13d1d595 (diff) |
OpenGL: port away from QLatin1String
Replace the uses of QLatin1String with corresponding string literals
where applies, or with QLatin1StringView.
As a drive-by, fix formatting of a warning message in
qopenglengineshadermanager.cpp.
Task-number: QTBUG-98434
Change-Id: I12f4479637a8fe265138f240a1310d2d576454a7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/opengl/qopengltextureglyphcache.cpp')
-rw-r--r-- | src/opengl/qopengltextureglyphcache.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/opengl/qopengltextureglyphcache.cpp b/src/opengl/qopengltextureglyphcache.cpp index 6c8971fddb..54efe524ff 100644 --- a/src/opengl/qopengltextureglyphcache.cpp +++ b/src/opengl/qopengltextureglyphcache.cpp @@ -345,11 +345,11 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) { QString source; #ifdef Q_OS_WASM - source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader)); - source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader)); #else - source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader)); - source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader)); #endif m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, source); } @@ -357,11 +357,11 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) { QString source; #ifdef Q_OS_WASM - source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader)); - source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader)); #else - source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader)); - source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader)); + source.append(QLatin1StringView(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader)); #endif m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, source); } |