diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-16 16:40:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 06:30:37 +0100 |
| commit | 8ff5b88b27b83438bfe576eea824a4a4d47249ce (patch) | |
| tree | 1ccb1b0114ec8371ac44a0ab68535c50f8e4e604 /tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h | |
| parent | 382ba7d4f4c1ca91d59d04faf35a3d75d6430df5 (diff) | |
Changed metadata keys type from enum to QString.
This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.
Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h')
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h index 0e61dd7a2..96d486d87 100644 --- a/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h @@ -63,26 +63,16 @@ public: if (m_available != available) emit metaDataAvailableChanged(m_available = available); } - QList<QtMultimedia::MetaData> availableMetaData() const + QStringList availableMetaData() const { return m_data.keys(); } - QVariant metaData(QtMultimedia::MetaData key) const + QVariant metaData(const QString &key) const { return m_data.value(key); } - QVariant extendedMetaData(const QString &key) const - { - return m_extendedData.value(key); - } - - QStringList availableExtendedMetaData() const - { - return m_extendedData.keys(); - } - using QMetaDataReaderControl::metaDataChanged; void populateMetaData() @@ -91,8 +81,7 @@ public: } bool m_available; - QMap<QtMultimedia::MetaData, QVariant> m_data; - QMap<QString, QVariant> m_extendedData; + QMap<QString, QVariant> m_data; }; #endif // MOCKMETADATAREADERCONTROL_H |