diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-11-01 00:33:21 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:20:06 +0100 |
| commit | 832c3929f2222e0e10ada33549c9d1cf90373018 (patch) | |
| tree | 81160e77da3704c2403d03ad0cc60f06ace98ac8 /src/plugins/gstreamer/mediacapture | |
| parent | 13fd00199a6a41af2bdbb876fe33c75547e3d996 (diff) | |
Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp index 87f046f0d..b1189e7e3 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp @@ -199,8 +199,8 @@ GstElement *QGstreamerAudioEncode::createEncoder() } if (encoderElement) { - if (m_audioSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) { - QtMultimedia::EncodingQuality qualityValue = m_audioSettings.quality(); + if (m_audioSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) { + QMultimedia::EncodingQuality qualityValue = m_audioSettings.quality(); if (codec == QLatin1String("audio/vorbis")) { double qualityTable[] = { diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp index 55c4129fe..ea0304ddf 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp @@ -177,7 +177,7 @@ void QGstreamerCaptureServicePlugin::updateDevices() const } #endif -QtMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType, +QMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const { if (m_supportedMimeTypeSet.isEmpty()) diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h index 216cd06c3..0e1aacafc 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h @@ -80,7 +80,7 @@ public: QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property); #endif - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QStringList supportedMimeTypes() const; private: diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp index 80351a548..100848d2e 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp @@ -171,8 +171,8 @@ GstElement *QGstreamerVideoEncode::createEncoder() gst_object_unref(GST_OBJECT(pad)); if (encoderElement) { - if (m_videoSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) { - QtMultimedia::EncodingQuality qualityValue = m_videoSettings.quality(); + if (m_videoSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) { + QMultimedia::EncodingQuality qualityValue = m_videoSettings.quality(); if (codec == QLatin1String("video/h264")) { //constant quantizer mode |