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/qcamera/tst_qcamera.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/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index a39945c3c..8f6339bf6 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -778,9 +778,9 @@ void tst_QCamera::testImageSettings() QVERIFY(settings != QImageEncoderSettings()); settings = QImageEncoderSettings(); - QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); - settings.setQuality(QtMultimedia::HighQuality); - QCOMPARE(settings.quality(), QtMultimedia::HighQuality); + QCOMPARE(settings.quality(), QMultimedia::NormalQuality); + settings.setQuality(QMultimedia::HighQuality); + QCOMPARE(settings.quality(), QMultimedia::HighQuality); QVERIFY(!settings.isNull()); settings = QImageEncoderSettings(); @@ -808,7 +808,7 @@ void tst_QCamera::testImageSettings() settings = QImageEncoderSettings(); QVERIFY(settings.isNull()); QCOMPARE(settings.codec(), QString()); - QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); + QCOMPARE(settings.quality(), QMultimedia::NormalQuality); QCOMPARE(settings.resolution(), QSize()); QVERIFY(settings.encodingOptions().isEmpty()); @@ -821,7 +821,7 @@ void tst_QCamera::testImageSettings() QCOMPARE(settings2, settings1); QVERIFY(settings2.isNull()); - settings1.setQuality(QtMultimedia::HighQuality); + settings1.setQuality(QMultimedia::HighQuality); QVERIFY(settings2.isNull()); QVERIFY(!settings1.isNull()); @@ -837,7 +837,7 @@ void tst_QCamera::testImageSettings() QCOMPARE(settings2, settings1); QVERIFY(settings2.isNull()); - settings1.setQuality(QtMultimedia::HighQuality); + settings1.setQuality(QMultimedia::HighQuality); QVERIFY(settings2.isNull()); QVERIFY(!settings1.isNull()); @@ -864,11 +864,11 @@ void tst_QCamera::testImageSettings() QVERIFY(settings1 != settings2); settings1 = QImageEncoderSettings(); - settings1.setQuality(QtMultimedia::NormalQuality); + settings1.setQuality(QMultimedia::NormalQuality); settings2 = QImageEncoderSettings(); - settings2.setQuality(QtMultimedia::NormalQuality); + settings2.setQuality(QMultimedia::NormalQuality); QVERIFY(settings1 == settings2); - settings2.setQuality(QtMultimedia::LowQuality); + settings2.setQuality(QMultimedia::LowQuality); QVERIFY(settings1 != settings2); settings1 = QImageEncoderSettings(); @@ -1233,7 +1233,7 @@ void tst_QCamera::testQCameraIsAvailable() { QCamera camera; QVERIFY(camera.isAvailable()); - QVERIFY(camera.availability() == QtMultimedia::Available); + QVERIFY(camera.availability() == QMultimedia::Available); } void tst_QCamera::testQCameraIsNotAvailable() @@ -1243,7 +1243,7 @@ void tst_QCamera::testQCameraIsNotAvailable() QCOMPARE(camera.error(), QCamera::ServiceMissingError); QVERIFY(!camera.isAvailable()); - QCOMPARE(camera.availability(), QtMultimedia::ServiceMissing); + QCOMPARE(camera.availability(), QMultimedia::ServiceMissing); } /* Test case for searchAndLock ( QCamera::LockTypes locks ) */ |