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 /examples | |
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 'examples')
-rw-r--r-- | examples/audiorecorder/audiorecorder.cpp | 10 | ||||
-rw-r--r-- | examples/audiorecorder/doc/src/audiorecorder.qdoc | 10 | ||||
-rw-r--r-- | examples/camera/imagesettings.cpp | 4 | ||||
-rw-r--r-- | examples/camera/videosettings.cpp | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp index e138cdb1e..12a3a4db2 100644 --- a/examples/audiorecorder/audiorecorder.cpp +++ b/examples/audiorecorder/audiorecorder.cpp @@ -91,8 +91,8 @@ AudioRecorder::AudioRecorder(QWidget *parent) sampleRate)); } - ui->qualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); - ui->qualitySlider->setValue(int(QtMultimedia::NormalQuality)); + ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); + ui->qualitySlider->setValue(int(QMultimedia::NormalQuality)); //bitrates: ui->bitrateBox->addItem(QString("Default"), QVariant(0)); @@ -175,10 +175,10 @@ void AudioRecorder::toggleRecord() settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setSampleRate(boxValue(ui->sampleRateBox).toInt()); settings.setBitRate(boxValue(ui->bitrateBox).toInt()); - settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value())); + settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value())); settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? - QtMultimedia::ConstantQualityEncoding : - QtMultimedia::ConstantBitRateEncoding); + QMultimedia::ConstantQualityEncoding : + QMultimedia::ConstantBitRateEncoding); QString container = boxValue(ui->containerBox).toString(); diff --git a/examples/audiorecorder/doc/src/audiorecorder.qdoc b/examples/audiorecorder/doc/src/audiorecorder.qdoc index 8e1f563db..3dea92cac 100644 --- a/examples/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/audiorecorder/doc/src/audiorecorder.qdoc @@ -45,8 +45,8 @@ \l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and \l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()} methods. The quality slider is setup from 0 (zero) to - \l{QtMultimedia::VeryHighQuality} with a default value of - \l{QtMultimedia::NormalQuality}, while the bitrates are hardcoded + \l{QMultimedia::VeryHighQuality} with a default value of + \l{QMultimedia::NormalQuality}, while the bitrates are hardcoded into the list. \image audiorecorder.png @@ -77,10 +77,10 @@ settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setSampleRate(boxValue(ui->sampleRateBox).toInt()); settings.setBitRate(boxValue(ui->bitrateBox).toInt()); - settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value())); + settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value())); settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? - QtMultimedia::ConstantQualityEncoding : - QtMultimedia::ConstantBitRateEncoding); + QMultimedia::ConstantQualityEncoding : + QMultimedia::ConstantBitRateEncoding); QString container = boxValue(ui->containerBox).toString(); diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp index d6b311f8b..080802191 100644 --- a/examples/camera/imagesettings.cpp +++ b/examples/camera/imagesettings.cpp @@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName)); } - ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); + ui->imageQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); ui->imageResolutionBox->addItem(tr("Default Resolution")); QList<QSize> supportedResolutions = imagecapture->supportedResolutions(); @@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const { QImageEncoderSettings settings = imagecapture->encodingSettings(); settings.setCodec(boxValue(ui->imageCodecBox).toString()); - settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value())); + settings.setQuality(QMultimedia::EncodingQuality(ui->imageQualitySlider->value())); settings.setResolution(boxValue(ui->imageResolutionBox).toSize()); return settings; diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp index 2ef1c6ce8..0b3e5d811 100644 --- a/examples/camera/videosettings.cpp +++ b/examples/camera/videosettings.cpp @@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) : ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate)); } - ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); + ui->audioQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); //video codecs ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString())); @@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) : ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName)); } - ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); + ui->videoQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); ui->videoResolutionBox->addItem(tr("Default")); @@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const { QAudioEncoderSettings settings = mediaRecorder->audioSettings(); settings.setCodec(boxValue(ui->audioCodecBox).toString()); - settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value())); + settings.setQuality(QMultimedia::EncodingQuality(ui->audioQualitySlider->value())); settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt()); return settings; } @@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const { QVideoEncoderSettings settings = mediaRecorder->videoSettings(); settings.setCodec(boxValue(ui->videoCodecBox).toString()); - settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value())); + settings.setQuality(QMultimedia::EncodingQuality(ui->videoQualitySlider->value())); settings.setResolution(boxValue(ui->videoResolutionBox).toSize()); settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>()); |