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>

1 files changed, 1 insertions, 22 deletions

diff --git a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
index ca0b38499..b0ebd5db1 100644
--- a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
+++ b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
@@ -52,10 +52,8 @@ private slots:
     // Test case for QMetaDataReaderControl
     void metaDataReaderControlConstructor();
     void metaDataReaderControlAvailableMetaData();
-    void metaDataReaderControlExtendedMetaData();
     void metaDataReaderControlIsMetaDataAvailable();
     void metaDataReaderControlMetaData();
-    void metaDataReaderControlAvailableExtendedMetaData();
     void metaDataReaderControlMetaDataAvailableChangedSignal();
     void metaDataReaderControlMetaDataChangedSignal();
 };
@@ -79,16 +77,6 @@ void tst_QMetaDataReaderControl::metaDataReaderControlAvailableMetaData()
     delete metaData;
 }
 
-/* Test case for extendedMetaData */
-void tst_QMetaDataReaderControl::metaDataReaderControlExtendedMetaData ()
-{
-    const QString titleKey(QLatin1String("Title"));
-    MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl();
-    QVERIFY(metaData !=NULL);
-    metaData->extendedMetaData(titleKey);
-    delete metaData;
-}
-
 /* Test case for availableMetaData */
 void tst_QMetaDataReaderControl::metaDataReaderControlIsMetaDataAvailable ()
 {
@@ -103,16 +91,7 @@ void tst_QMetaDataReaderControl::metaDataReaderControlMetaData ()
 {
     MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl();
     QVERIFY(metaData !=NULL);
-    metaData->metaData(QtMultimedia::Title);
-    delete metaData;
-}
-
-/* Test case for availableExtendedMetaData */
-void tst_QMetaDataReaderControl::metaDataReaderControlAvailableExtendedMetaData ()
-{
-    MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl();
-    QVERIFY(metaData !=NULL);
-    metaData->availableExtendedMetaData();
+    metaData->metaData(QtMultimedia::MetaData::Title);
     delete metaData;
 }