diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 12:46:31 +0200 |
| commit | de3e06a9e2f285571d5dcf40f67bc19615119c5c (patch) | |
| tree | b86efd520989b9a9bbe15a331b76d0aeec8be6a7 | |
| parent | dd5b373d41f99f06efd1a927a3323abada4fd6ef (diff) | |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtOpenGL]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: I6ea46cd6dfed75afc253fa2b4e3f1789bdad1d4e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| -rw-r--r-- | src/opengl/qgl.cpp | 6 | ||||
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarks/opengl/main.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 893915f433..e306ea4476 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1113,7 +1113,7 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co } else { // not ES, regular OpenGL, the version numbers are first in the string if (versionString.startsWith(QLatin1String("1."))) { - switch (versionString[2].toAscii()) { + switch (versionString[2].toLatin1()) { case '5': versionFlags |= QGLFormat::OpenGL_Version_1_5; case '4': @@ -1134,7 +1134,7 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_2_0; - if (versionString[2].toAscii() == '1') + if (versionString[2].toLatin1() == '1') versionFlags |= QGLFormat::OpenGL_Version_2_1; } else if (versionString.startsWith(QLatin1String("3."))) { versionFlags |= QGLFormat::OpenGL_Version_1_1 | @@ -1145,7 +1145,7 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co QGLFormat::OpenGL_Version_2_0 | QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_3_0; - switch (versionString[2].toAscii()) { + switch (versionString[2].toLatin1()) { case '3': versionFlags |= QGLFormat::OpenGL_Version_3_3; case '2': diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index ef65d0821b..8810b70f08 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -234,7 +234,7 @@ void QGLContext::swapBuffers() const QFunctionPointer QGLContext::getProcAddress(const QString &procName) const { Q_D(const QGLContext); - return d->guiGlContext->getProcAddress(procName.toAscii()); + return d->guiGlContext->getProcAddress(procName.toLatin1()); } void QGLWidget::setContext(QGLContext *context, diff --git a/tests/benchmarks/opengl/main.cpp b/tests/benchmarks/opengl/main.cpp index b92027ed7b..a61587c87e 100644 --- a/tests/benchmarks/opengl/main.cpp +++ b/tests/benchmarks/opengl/main.cpp @@ -111,7 +111,7 @@ void OpenGLBench::imageDrawing_data() bool pixmap = i & 4; QTest::newRow(QString("pixmap=%1 highQualityAntialiasing=%2 smoothPixmapTransform=%3") - .arg(pixmap).arg(highQualityAntialiasing).arg(smoothPixmapTransform).toAscii().data()) + .arg(pixmap).arg(highQualityAntialiasing).arg(smoothPixmapTransform).toLatin1().data()) << pixmap << highQualityAntialiasing << smoothPixmapTransform; } } @@ -178,7 +178,7 @@ void OpenGLBench::pathDrawing_data() for (int i = 0; i < paths.size(); ++i) { QTest::newRow(QString("path=%1 highQualityAntialiasing=%2") - .arg(paths[i].second).arg(highQualityAntialiasing).toAscii().data()) + .arg(paths[i].second).arg(highQualityAntialiasing).toLatin1().data()) << paths[i].first << highQualityAntialiasing; } } @@ -264,7 +264,7 @@ void OpenGLBench::textDrawing_data() QTest::newRow("text lines=1 (warmup run)") << 1; for (unsigned int i = 0; i < sizeof(lines) / sizeof(int); ++i) - QTest::newRow(QString("text lines=%0").arg(lines[i]).toAscii().data()) << lines[i]; + QTest::newRow(QString("text lines=%0").arg(lines[i]).toLatin1().data()) << lines[i]; } void OpenGLBench::textDrawing() |