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 /tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp | |
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 'tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp')
-rw-r--r-- | tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index 2f195b788..438802a82 100644 --- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -260,11 +260,11 @@ void tst_QCameraImageCapture::encodingSettings() QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings()); QImageEncoderSettings settings; settings.setCodec("JPEG"); - settings.setQuality(QtMultimedia::NormalQuality); + settings.setQuality(QMultimedia::NormalQuality); imageCapture.setEncodingSettings(settings); QVERIFY(!imageCapture.encodingSettings().isNull()); QVERIFY(imageCapture.encodingSettings().codec() == "JPEG"); - QVERIFY(imageCapture.encodingSettings().quality() == QtMultimedia::NormalQuality); + QVERIFY(imageCapture.encodingSettings().quality() == QMultimedia::NormalQuality); } //MaemoAPI-1838:test supportedImageCodecs @@ -312,7 +312,7 @@ void tst_QCameraImageCapture::errors() imageCapture1.capture(QString::fromLatin1("/dev/null")); QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError); QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture"); - QVERIFY(imageCapture1.availability() == QtMultimedia::ServiceMissing); + QVERIFY(imageCapture1.availability() == QMultimedia::ServiceMissing); provider->service = mockcameraservice; @@ -321,12 +321,12 @@ void tst_QCameraImageCapture::errors() QVERIFY(imageCapture.isAvailable() == true); QVERIFY(imageCapture.error() == QCameraImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); - QVERIFY(imageCapture.availability() == QtMultimedia::Available); + QVERIFY(imageCapture.availability() == QMultimedia::Available); imageCapture.capture(); QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError); QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state"); - QVERIFY(imageCapture.availability() == QtMultimedia::Available); + QVERIFY(imageCapture.availability() == QMultimedia::Available); } //MaemoAPI-1831:test error |