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/qradiotuner | |
| 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/qradiotuner')
| -rw-r--r-- | tests/auto/unit/qradiotuner/tst_qradiotuner.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp index 66416e9c6..cbf2fe6c1 100644 --- a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp +++ b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp @@ -95,7 +95,7 @@ void tst_QRadioTuner::initTestCase() qRegisterMetaType<QRadioTuner::Band>("QRadioTuner::Band"); mock = new MockRadioTunerControl(this); - mockAvailability = new MockAvailabilityControl(QtMultimedia::Available); + mockAvailability = new MockAvailabilityControl(QMultimedia::Available); QMap<QString, QMediaControl *> map; map.insert(QRadioTunerControl_iid, mock); @@ -108,13 +108,13 @@ void tst_QRadioTuner::initTestCase() radio = new QRadioTuner; QVERIFY(radio->service() != 0); QVERIFY(radio->isAvailable()); - QVERIFY(radio->availability() == QtMultimedia::Available); + QVERIFY(radio->availability() == QMultimedia::Available); QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State))); QCOMPARE(radio->state(), QRadioTuner::StoppedState); radio->start(); - QVERIFY(radio->availability() == QtMultimedia::Available); + QVERIFY(radio->availability() == QMultimedia::Available); QCOMPARE(radio->state(), QRadioTuner::ActiveState); QCOMPARE(stateSpy.count(), 1); @@ -129,7 +129,7 @@ void tst_QRadioTuner::cleanupTestCase() QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State))); radio->stop(); - QVERIFY(radio->availability() == QtMultimedia::Available); + QVERIFY(radio->availability() == QMultimedia::Available); QCOMPARE(radio->state(), QRadioTuner::StoppedState); QCOMPARE(stateSpy.count(), 1); |