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/qcamera/tst_qcamera.cpp | |
| 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/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 788579507..a39945c3c 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -497,12 +497,12 @@ void tst_QCamera::testCameraCaptureMetadata() QVariantList metadata = metadataSignal[0]; QCOMPARE(metadata[0].toInt(), id); - QCOMPARE(metadata[1].toString(), QtMultimedia::MetaData::FocalLengthIn35mmFilm); + QCOMPARE(metadata[1].toString(), QMediaMetaData::FocalLengthIn35mmFilm); QCOMPARE(metadata[2].value<QVariant>().toInt(), 50); metadata = metadataSignal[1]; QCOMPARE(metadata[0].toInt(), id); - QCOMPARE(metadata[1].toString(), QtMultimedia::MetaData::DateTimeOriginal); + QCOMPARE(metadata[1].toString(), QMediaMetaData::DateTimeOriginal); QDateTime captureTime = metadata[2].value<QVariant>().value<QDateTime>(); QVERIFY(qAbs(captureTime.secsTo(QDateTime::currentDateTime()) < 5)); //it should not takes more than 5 seconds for signal to arrive here |