AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtOpenGL]

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2012-05-02 16:32:26 +02:00 committed by Qt by Nokia
parent dd5b373d41
commit de3e06a9e2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opengl/qgl.cpp
View File

@ -1113,7 +1113,7 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
} else { } else {
// not ES, regular OpenGL, the version numbers are first in the string // not ES, regular OpenGL, the version numbers are first in the string
if (versionString.startsWith(QLatin1String("1."))) { if (versionString.startsWith(QLatin1String("1."))) {
switch (versionString[2].toAscii()) { switch (versionString[2].toLatin1()) {
case '5': case '5':
versionFlags |= QGLFormat::OpenGL_Version_1_5; versionFlags |= QGLFormat::OpenGL_Version_1_5;
case '4': case '4':
@ -1134,7 +1134,7 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_4 |
QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_5 |
QGLFormat::OpenGL_Version_2_0; QGLFormat::OpenGL_Version_2_0;
if (versionString[2].toAscii() == '1') if (versionString[2].toLatin1() == '1')
versionFlags |= QGLFormat::OpenGL_Version_2_1; versionFlags |= QGLFormat::OpenGL_Version_2_1;
} else if (versionString.startsWith(QLatin1String("3."))) { } else if (versionString.startsWith(QLatin1String("3."))) {
versionFlags |= QGLFormat::OpenGL_Version_1_1 | 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_0 |
QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_2_1 |
QGLFormat::OpenGL_Version_3_0; QGLFormat::OpenGL_Version_3_0;
switch (versionString[2].toAscii()) { switch (versionString[2].toLatin1()) {
case '3': case '3':
versionFlags |= QGLFormat::OpenGL_Version_3_3; versionFlags |= QGLFormat::OpenGL_Version_3_3;
case '2': case '2':

2
src/opengl/qgl_qpa.cpp
View File

@ -234,7 +234,7 @@ void QGLContext::swapBuffers() const
QFunctionPointer QGLContext::getProcAddress(const QString &procName) const QFunctionPointer QGLContext::getProcAddress(const QString &procName) const
{ {
Q_D(const QGLContext); Q_D(const QGLContext);
return d->guiGlContext->getProcAddress(procName.toAscii()); return d->guiGlContext->getProcAddress(procName.toLatin1());
} }
void QGLWidget::setContext(QGLContext *context, void QGLWidget::setContext(QGLContext *context,

6
tests/benchmarks/opengl/main.cpp
View File

@ -111,7 +111,7 @@ void OpenGLBench::imageDrawing_data()
bool pixmap = i & 4; bool pixmap = i & 4;
QTest::newRow(QString("pixmap=%1 highQualityAntialiasing=%2 smoothPixmapTransform=%3") 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; << pixmap << highQualityAntialiasing << smoothPixmapTransform;
} }
} }
@ -178,7 +178,7 @@ void OpenGLBench::pathDrawing_data()
for (int i = 0; i < paths.size(); ++i) { for (int i = 0; i < paths.size(); ++i) {
QTest::newRow(QString("path=%1 highQualityAntialiasing=%2") 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; << paths[i].first << highQualityAntialiasing;
} }
} }
@ -264,7 +264,7 @@ void OpenGLBench::textDrawing_data()
QTest::newRow("text lines=1 (warmup run)") << 1; QTest::newRow("text lines=1 (warmup run)") << 1;
for (unsigned int i = 0; i < sizeof(lines) / sizeof(int); ++i) 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() void OpenGLBench::textDrawing()