diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-10-31 19:37:48 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:19:57 +0100 |
| commit | 00d709216335b68b5eb81ae9bf726c82a079e12c (patch) | |
| tree | 571dcc87ca419e092512c62c76864fceff49088a /tests/auto/unit/qmediaobject | |
| parent | 0affd9023ff1146c822cd188612c7727947ea618 (diff) | |
Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
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 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 9fd8c747a..1b83e1af0 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -346,7 +346,7 @@ void tst_QMediaObject::nullMetaDataControl() QCOMPARE(object.isMetaDataAvailable(), false); - QCOMPARE(object.metaData(QtMultimedia::MetaData::Title).toString(), QString()); + QCOMPARE(object.metaData(QMediaMetaData::Title).toString(), QString()); QCOMPARE(object.availableMetaData(), QStringList()); QCOMPARE(spy.count(), 0); } @@ -422,18 +422,18 @@ void tst_QMediaObject::metaData() QtTestMediaObject object(&service); QVERIFY(object.availableMetaData().isEmpty()); - service.metaData.m_data.insert(QtMultimedia::MetaData::AlbumArtist, artist); - service.metaData.m_data.insert(QtMultimedia::MetaData::Title, title); - service.metaData.m_data.insert(QtMultimedia::MetaData::Genre, genre); + service.metaData.m_data.insert(QMediaMetaData::AlbumArtist, artist); + service.metaData.m_data.insert(QMediaMetaData::Title, title); + service.metaData.m_data.insert(QMediaMetaData::Genre, genre); - QCOMPARE(object.metaData(QtMultimedia::MetaData::AlbumArtist).toString(), artist); - QCOMPARE(object.metaData(QtMultimedia::MetaData::Title).toString(), title); + QCOMPARE(object.metaData(QMediaMetaData::AlbumArtist).toString(), artist); + QCOMPARE(object.metaData(QMediaMetaData::Title).toString(), title); QStringList metaDataKeys = object.availableMetaData(); QCOMPARE(metaDataKeys.size(), 3); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::AlbumArtist)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Title)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Genre)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::AlbumArtist)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Title)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Genre)); } void tst_QMediaObject::availability() |