diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 16:58:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:36:08 +0200 |
| commit | b2b92dad82db4ed07a7eeb10f8e225d22d54a6c1 (patch) | |
| tree | 7b3eaaabcd21c917d06f284e7ba95a5d91d7190a /examples | |
| parent | 025f4d2ee1cdc4a68e880854584f9bef0980b630 (diff) | |
Change uses of {to,from}Ascii to {to,from}Latin1
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: Ic591779a3431999c007fb0ff362c7e25ce54097e
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'examples')
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp index a124133ea..cc594ee60 100644 --- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -68,7 +68,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) #else QString pathInInstallDir; const QString applicationDirPath = QCoreApplication::applicationDirPath(); - pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path); + pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path); if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; diff --git a/examples/video/qmlvideofx/filereader.cpp b/examples/video/qmlvideofx/filereader.cpp index 1d6b03279..676b95fac 100644 --- a/examples/video/qmlvideofx/filereader.cpp +++ b/examples/video/qmlvideofx/filereader.cpp @@ -57,7 +57,7 @@ QString adjustPath(const QString &path) #else QString pathInInstallDir; const QString applicationDirPath = QCoreApplication::applicationDirPath(); - pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path); + pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path); if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp index 40d140f56..bcefca846 100644 --- a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -68,7 +68,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) #else QString pathInInstallDir; const QString applicationDirPath = QCoreApplication::applicationDirPath(); - pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path); + pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path); if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/video/snippets/frequencymonitor/frequencymonitor.cpp index 8021d64df..55acde849 100644 --- a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp +++ b/examples/video/snippets/frequencymonitor/frequencymonitor.cpp @@ -192,7 +192,7 @@ void FrequencyMonitor::notify() void FrequencyMonitor::trace() { Q_D(FrequencyMonitor); - const QString value = QString::fromAscii("instant %1 average %2") + const QString value = QString::fromLatin1("instant %1 average %2") .arg(d->m_instantaneousFrequency, 0, 'f', 2) .arg(d->m_averageFrequency, 0, 'f', 2); if (d->m_label.isEmpty()) |