From da7e534df254b4b03c289d4286f887cd98059782 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sun, 20 Oct 2013 15:34:37 +0100 Subject: Use QByteArrayLiteral throughout in QOpenGLVertexArrayObject Change-Id: Ia362ead0ffdc077bd0db5d980c80464838c934ea Reviewed-by: Giuseppe D'Angelo --- src/gui/opengl/qopenglvertexarrayobject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/opengl/qopenglvertexarrayobject.cpp') diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/gui/opengl/qopenglvertexarrayobject.cpp index 1f039a8ca9b..ee8abde77b9 100644 --- a/src/gui/opengl/qopenglvertexarrayobject.cpp +++ b/src/gui/opengl/qopenglvertexarrayobject.cpp @@ -63,14 +63,14 @@ public: DeleteVertexArrays = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysAPPLE"))); BindVertexArray = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayAPPLE"))); } else { - GenVertexArrays = reinterpret_cast(context->getProcAddress("glGenVertexArrays")); - DeleteVertexArrays = reinterpret_cast(context->getProcAddress("glDeleteVertexArrays")); - BindVertexArray = reinterpret_cast(context->getProcAddress("glBindVertexArray")); + GenVertexArrays = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glGenVertexArrays"))); + DeleteVertexArrays = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArrays"))); + BindVertexArray = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glBindVertexArray"))); } #else - GenVertexArrays = reinterpret_cast(context->getProcAddress("glGenVertexArraysOES")); - DeleteVertexArrays = reinterpret_cast(context->getProcAddress("glDeleteVertexArraysOES")); - BindVertexArray = reinterpret_cast(context->getProcAddress("glBindVertexArrayOES")); + GenVertexArrays = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glGenVertexArraysOES"))); + DeleteVertexArrays = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysOES"))); + BindVertexArray = reinterpret_cast(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayOES"))); #endif } @@ -169,7 +169,7 @@ bool QOpenGLVertexArrayObjectPrivate::create() QObject::connect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed())); #if defined(QT_OPENGL_ES_2) - if (ctx->hasExtension("GL_OES_vertex_array_object")) { + if (ctx->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) { vaoFuncs = new QVertexArrayObjectHelper(ctx); vaoFuncs->glGenVertexArrays(1, &vao); } @@ -187,7 +187,7 @@ bool QOpenGLVertexArrayObjectPrivate::create() vaoFuncsType = Core_3_0; vaoFuncs.core_3_0->initializeOpenGLFunctions(); vaoFuncs.core_3_0->glGenVertexArrays(1, &vao); - } else if (ctx->hasExtension("GL_ARB_vertex_array_object")) { + } else if (ctx->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) { vaoFuncs.helper = new QVertexArrayObjectHelper(ctx); vaoFuncsType = ARB; vaoFuncs.helper->glGenVertexArrays(1, &vao); -- cgit v1.2.3