From c1db1788c0471d371b25733fffd19ae2c8631a23 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 25 Apr 2022 10:42:03 +0200 Subject: [PATCH] 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 --- src/opengl/qopenglengineshadermanager.cpp | 8 +++----- src/opengl/qopenglshaderprogram.cpp | 6 ++++-- src/opengl/qopengltextureglyphcache.cpp | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/opengl/qopenglengineshadermanager.cpp b/src/opengl/qopenglengineshadermanager.cpp index cf7424adb13..679c39385d9 100644 --- a/src/opengl/qopenglengineshadermanager.cpp +++ b/src/opengl/qopenglengineshadermanager.cpp @@ -454,11 +454,9 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO if (!inCache) shaderCache.store(newProg->program, QOpenGLContext::currentContext()); } else { - QString error; - error = QLatin1String("Shader program failed to link") - + QLatin1String(" Error Log:\n") - + QLatin1String(" ") + newProg->program->log(); - qWarning() << error; + qWarning("Shader program failed to link\n" + " Error Log:\n" + " %ls", qUtf16Printable(newProg->program->log())); break; } diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp index 5cb539b5db6..d4dee6c6744 100644 --- a/src/opengl/qopenglshaderprogram.cpp +++ b/src/opengl/qopenglshaderprogram.cpp @@ -61,6 +61,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QOpenGLShaderProgram \brief The QOpenGLShaderProgram class allows OpenGL shader programs to be linked and used. @@ -398,7 +400,7 @@ bool QOpenGLShaderPrivate::compile(QOpenGLShader *q) if (logBuffer) log = QString::fromLatin1(logBuffer); else - log = QLatin1String("failed"); + log = u"failed"_s; if (name.isEmpty()) qWarning("QOpenGLShader::compile(%s): %s", type, qPrintable(log)); @@ -579,7 +581,7 @@ static QVersionDirectivePosition findVersionDirectivePosition(const char *source case CommentEnding: if (*c == '/') state = Normal; - else if (*c != QLatin1Char('*')) + else if (*c != u'*') state = MultiLineComment; break; } diff --git a/src/opengl/qopengltextureglyphcache.cpp b/src/opengl/qopengltextureglyphcache.cpp index 6c8971fddb9..54efe524ff6 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); }