slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change uses of {to,from}Ascii to {to,from}Latin1

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: Ic591779a3431999c007fb0ff362c7e25ce54097e
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
This commit is contained in:
Thiago Macieira
2012-05-03 16:58:59 +02:00
committed by Qt by Nokia
parent 025f4d2ee1
commit b2b92dad82
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -68,7 +68,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
#else #else
QString pathInInstallDir; QString pathInInstallDir;
const QString applicationDirPath = QCoreApplication::applicationDirPath(); 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()) if (QFileInfo(pathInInstallDir).exists())
return pathInInstallDir; return pathInInstallDir;

2
examples/video/qmlvideofx/filereader.cpp
View File

@@ -57,7 +57,7 @@ QString adjustPath(const QString &path)
#else #else
QString pathInInstallDir; QString pathInInstallDir;
const QString applicationDirPath = QCoreApplication::applicationDirPath(); 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()) if (QFileInfo(pathInInstallDir).exists())
return pathInInstallDir; return pathInInstallDir;

2
examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -68,7 +68,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
#else #else
QString pathInInstallDir; QString pathInInstallDir;
const QString applicationDirPath = QCoreApplication::applicationDirPath(); 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()) if (QFileInfo(pathInInstallDir).exists())
return pathInInstallDir; return pathInInstallDir;

2
examples/video/snippets/frequencymonitor/frequencymonitor.cpp
View File

@@ -192,7 +192,7 @@ void FrequencyMonitor::notify()
void FrequencyMonitor::trace() void FrequencyMonitor::trace()
{ {
Q_D(FrequencyMonitor); 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_instantaneousFrequency, 0, 'f', 2)
.arg(d->m_averageFrequency, 0, 'f', 2); .arg(d->m_averageFrequency, 0, 'f', 2);
if (d->m_label.isEmpty()) if (d->m_label.isEmpty())

2
src/multimedia/audio/qsoundeffect_pulse_p.cpp
View File

@@ -170,7 +170,7 @@ private:
m_mainLoopApi = pa_threaded_mainloop_get_api(m_mainLoop); m_mainLoopApi = pa_threaded_mainloop_get_api(m_mainLoop);
lock(); lock();
m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toAscii().constData()); m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toLatin1().constData());
pa_context_set_state_callback(m_context, context_state_callback, this); pa_context_set_state_callback(m_context, context_state_callback, this);

2
src/multimedia/video/qabstractvideobuffer.cpp
View File

@@ -232,7 +232,7 @@ QDebug operator<<(QDebug dbg, QAbstractVideoBuffer::HandleType type)
case QAbstractVideoBuffer::QPixmapHandle: case QAbstractVideoBuffer::QPixmapHandle:
return dbg.nospace() << "QPixmapHandle"; return dbg.nospace() << "QPixmapHandle";
default: default:
return dbg.nospace() << QString(QLatin1String("UserHandle(%1)")).arg(int(type)).toAscii().constData(); return dbg.nospace() << QString(QLatin1String("UserHandle(%1)")).arg(int(type)).toLatin1().constData();
} }
} }

2
src/multimedia/video/qvideoframe.cpp
View File

@@ -930,7 +930,7 @@ QDebug operator<<(QDebug dbg, QVideoFrame::PixelFormat pf)
return dbg.nospace() << "Format_CameraRaw"; return dbg.nospace() << "Format_CameraRaw";
default: default:
return dbg.nospace() << QString(QLatin1String("UserType(%1)" )).arg(int(pf)).toAscii().constData(); return dbg.nospace() << QString(QLatin1String("UserType(%1)" )).arg(int(pf)).toLatin1().constData();
} }
} }

2
src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp
View File

@@ -105,7 +105,7 @@ bool CameraBinImageProcessing::setColorBalanceValue(const QString& channel, int
for (item = controls; item; item = g_list_next (item)) { for (item = controls; item; item = g_list_next (item)) {
colorBalanceChannel = (GstColorBalanceChannel *)item->data; colorBalanceChannel = (GstColorBalanceChannel *)item->data;
if (!g_ascii_strcasecmp (colorBalanceChannel->label, channel.toAscii())) { if (!g_ascii_strcasecmp (colorBalanceChannel->label, channel.toLatin1())) {
gst_color_balance_set_value (balance, colorBalanceChannel, value); gst_color_balance_set_value (balance, colorBalanceChannel, value);
return true; return true;
} }

8
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
View File

@@ -261,16 +261,16 @@ GstElement *QGstreamerAudioEncode::createEncoder()
switch (value.type()) { switch (value.type()) {
case QVariant::Int: case QVariant::Int:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toInt(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toInt(), NULL);
break; break;
case QVariant::Bool: case QVariant::Bool:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toBool(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toBool(), NULL);
break; break;
case QVariant::Double: case QVariant::Double:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toDouble(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toDouble(), NULL);
break; break;
case QVariant::String: case QVariant::String:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toString().toUtf8().constData(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toString().toUtf8().constData(), NULL);
break; break;
default: default:
qWarning() << "unsupported option type:" << option << value; qWarning() << "unsupported option type:" << option << value;

8
src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
View File

@@ -220,7 +220,7 @@ GstElement *QGstreamerCaptureSession::buildAudioSrc()
elementName = "autoaudiosrc"; elementName = "autoaudiosrc";
} }
audioSrc = gst_element_factory_make(elementName.toAscii().constData(), "audio_src"); audioSrc = gst_element_factory_make(elementName.toLatin1().constData(), "audio_src");
if (audioSrc && !device.isEmpty()) if (audioSrc && !device.isEmpty())
g_object_set(G_OBJECT(audioSrc), "device", device.toLocal8Bit().constData(), NULL); g_object_set(G_OBJECT(audioSrc), "device", device.toLocal8Bit().constData(), NULL);
} }
@@ -309,7 +309,7 @@ GstElement *QGstreamerCaptureSession::buildVideoPreview()
structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb"; structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb";
foreach(const QString &structureType, structureTypes) { foreach(const QString &structureType, structureTypes) {
GstStructure *structure = gst_structure_new(structureType.toAscii().constData(), NULL); GstStructure *structure = gst_structure_new(structureType.toLatin1().constData(), NULL);
if (!resolution.isEmpty()) { if (!resolution.isEmpty()) {
gst_structure_set(structure, "width", G_TYPE_INT, resolution.width(), NULL); gst_structure_set(structure, "width", G_TYPE_INT, resolution.width(), NULL);
@@ -667,7 +667,7 @@ bool QGstreamerCaptureSession::rebuildGraph(QGstreamerCaptureSession::PipelineMo
if (m_encodeBin) { if (m_encodeBin) {
QString fileName = QString("rebuild_graph_encode_%1_%2").arg(m_pipelineMode).arg(newMode); QString fileName = QString("rebuild_graph_encode_%1_%2").arg(m_pipelineMode).arg(newMode);
#if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19) #if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
_gst_debug_bin_to_dot_file(GST_BIN(m_encodeBin), GST_DEBUG_GRAPH_SHOW_ALL, fileName.toAscii()); _gst_debug_bin_to_dot_file(GST_BIN(m_encodeBin), GST_DEBUG_GRAPH_SHOW_ALL, fileName.toLatin1());
#endif #endif
} }
@@ -696,7 +696,7 @@ void QGstreamerCaptureSession::dumpGraph(const QString &fileName)
#if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19) #if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
_gst_debug_bin_to_dot_file(GST_BIN(m_pipeline), _gst_debug_bin_to_dot_file(GST_BIN(m_pipeline),
GstDebugGraphDetails(/*GST_DEBUG_GRAPH_SHOW_ALL |*/ GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE | GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS | GST_DEBUG_GRAPH_SHOW_STATES), GstDebugGraphDetails(/*GST_DEBUG_GRAPH_SHOW_ALL |*/ GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE | GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS | GST_DEBUG_GRAPH_SHOW_STATES),
fileName.toAscii()); fileName.toLatin1());
#endif #endif
} }

10
src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
View File

@@ -240,16 +240,16 @@ GstElement *QGstreamerVideoEncode::createEncoder()
switch (value.type()) { switch (value.type()) {
case QVariant::Int: case QVariant::Int:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toInt(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toInt(), NULL);
break; break;
case QVariant::Bool: case QVariant::Bool:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toBool(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toBool(), NULL);
break; break;
case QVariant::Double: case QVariant::Double:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toDouble(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toDouble(), NULL);
break; break;
case QVariant::String: case QVariant::String:
g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toString().toUtf8().constData(), NULL); g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toString().toUtf8().constData(), NULL);
break; break;
default: default:
qWarning() << "unsupported option type:" << option << value; qWarning() << "unsupported option type:" << option << value;
@@ -265,7 +265,7 @@ GstElement *QGstreamerVideoEncode::createEncoder()
structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb"; structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb";
foreach(const QString &structureType, structureTypes) { foreach(const QString &structureType, structureTypes) {
GstStructure *structure = gst_structure_new(structureType.toAscii().constData(), NULL); GstStructure *structure = gst_structure_new(structureType.toLatin1().constData(), NULL);
if (!m_videoSettings.resolution().isEmpty()) { if (!m_videoSettings.resolution().isEmpty()) {
gst_structure_set(structure, "width", G_TYPE_INT, m_videoSettings.resolution().width(), NULL); gst_structure_set(structure, "width", G_TYPE_INT, m_videoSettings.resolution().width(), NULL);

2
src/plugins/pulseaudio/qpulseaudioengine.cpp
View File

@@ -208,7 +208,7 @@ QPulseAudioEngine::QPulseAudioEngine(QObject *parent)
pa_threaded_mainloop_lock(m_mainLoop); pa_threaded_mainloop_lock(m_mainLoop);
m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtmPulseContext:%1")).arg(::getpid()).toAscii().constData()); m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtmPulseContext:%1")).arg(::getpid()).toLatin1().constData());
pa_context_set_state_callback(m_context, contextStateCallbackInit, this); pa_context_set_state_callback(m_context, contextStateCallbackInit, this);
if (!m_context) { if (!m_context) {

4
tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp
View File

@@ -122,9 +122,9 @@ void tst_QAbstractVideoBuffer::handleType_data()
// User handles are different // User handles are different
QTest::newRow("user1") QTest::newRow("user1")
<< QAbstractVideoBuffer::UserHandle << QString::fromAscii("UserHandle(1000)"); << QAbstractVideoBuffer::UserHandle << QString::fromLatin1("UserHandle(1000)");
QTest::newRow("user2") QTest::newRow("user2")
<< QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 1) << QString::fromAscii("UserHandle(1001)"); << QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 1) << QString::fromLatin1("UserHandle(1001)");
} }
void tst_QAbstractVideoBuffer::handleType() void tst_QAbstractVideoBuffer::handleType()