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/qmediaobject | |
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/qmediaobject')
-rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 1b83e1af0..71524fecd 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -441,52 +441,52 @@ void tst_QMediaObject::availability() { QtTestMediaObject nullObject(0); QCOMPARE(nullObject.isAvailable(), false); - QCOMPARE(nullObject.availability(), QtMultimedia::ServiceMissing); + QCOMPARE(nullObject.availability(), QMultimedia::ServiceMissing); } { QtTestMediaObjectService service; QtTestMediaObject object(&service); QCOMPARE(object.isAvailable(), true); - QCOMPARE(object.availability(), QtMultimedia::Available); + QCOMPARE(object.availability(), QMultimedia::Available); } { - MockAvailabilityControl available(QtMultimedia::Available); + MockAvailabilityControl available(QMultimedia::Available); QtTestMediaObjectService service(0, &available); QtTestMediaObject object(&service); QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool))); - QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus))); + QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus))); QCOMPARE(object.isAvailable(), true); - QCOMPARE(object.availability(), QtMultimedia::Available); + QCOMPARE(object.availability(), QMultimedia::Available); - available.setAvailability(QtMultimedia::Busy); + available.setAvailability(QMultimedia::Busy); QCOMPARE(object.isAvailable(), false); - QCOMPARE(object.availability(), QtMultimedia::Busy); + QCOMPARE(object.availability(), QMultimedia::Busy); QCOMPARE(availabilitySpy.count(), 1); QCOMPARE(availabilityStatusSpy.count(), 1); - available.setAvailability(QtMultimedia::Available); + available.setAvailability(QMultimedia::Available); QCOMPARE(object.isAvailable(), true); - QCOMPARE(object.availability(), QtMultimedia::Available); + QCOMPARE(object.availability(), QMultimedia::Available); QCOMPARE(availabilitySpy.count(), 2); QCOMPARE(availabilityStatusSpy.count(), 2); } { - MockAvailabilityControl available(QtMultimedia::Busy); + MockAvailabilityControl available(QMultimedia::Busy); QtTestMediaObjectService service(0, &available); QtTestMediaObject object(&service); QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool))); - QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus))); + QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus))); QCOMPARE(object.isAvailable(), false); - QCOMPARE(object.availability(), QtMultimedia::Busy); + QCOMPARE(object.availability(), QMultimedia::Busy); - available.setAvailability(QtMultimedia::Available); + available.setAvailability(QMultimedia::Available); QCOMPARE(object.isAvailable(), true); - QCOMPARE(object.availability(), QtMultimedia::Available); + QCOMPARE(object.availability(), QMultimedia::Available); QCOMPARE(availabilitySpy.count(), 1); QCOMPARE(availabilityStatusSpy.count(), 1); } |