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>

4 files changed, 12 insertions, 32 deletions

diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
index a201975b0..1080792e9 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
@@ -95,11 +95,11 @@ private Q_SLOTS:
             emit imageCaptured(m_captureRequest, QImage());
 
             emit imageMetadataAvailable(m_captureRequest,
-                                        QtMultimedia::FocalLengthIn35mmFilm,
+                                        QtMultimedia::MetaData::FocalLengthIn35mmFilm,
                                         QVariant(50));
 
             emit imageMetadataAvailable(m_captureRequest,
-                                        QtMultimedia::DateTimeOriginal,
+                                        QtMultimedia::MetaData::DateTimeOriginal,
                                         QVariant(QDateTime::currentDateTime()));
 
             emit imageMetadataAvailable(m_captureRequest,
diff --git a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h
index ed758ce6e..8c8ab713c 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h
@@ -55,9 +55,9 @@ public:
     StreamType streamType(int index) { return _streams.at(index).type; }
     void setStreamType(int index, StreamType type) { _streams[index].type = type; }
 
-    QVariant metaData(int index, QtMultimedia::MetaData key) {
+    QVariant metaData(int index, const QString &key) {
         return _streams.at(index).metaData.value(key); }
-    void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) {
+    void setMetaData(int index, const QString &key, const QVariant &value) {
         _streams[index].metaData.insert(key, value); }
 
     bool isActive(int index) { return _streams.at(index).active; }
@@ -68,7 +68,7 @@ private:
     {
         Stream() : type(UnknownStream), active(false) {}
         StreamType type;
-        QMap<QtMultimedia::MetaData, QVariant> metaData;
+        QMap<QString, QVariant> metaData;
         bool active;
     };
 
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
diff --git a/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h
index 8c452c7e3..1f9923214 100644
--- a/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h
@@ -64,25 +64,17 @@ public:
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); }
+    QStringList availableMetaData() const { return m_data.keys(); }
 
     bool isWritable() const { return m_writable; }
     void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
 
-    QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
-    void setMetaData(QtMultimedia::MetaData key, const QVariant &value)
+    QVariant metaData(const QString &key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
+    void setMetaData(const QString &key, const QVariant &value)
     {
         m_data.insert(key, value);
     }
 
-    QVariant extendedMetaData(const QString &key) const { return m_extendedData.value(key); }
-    void setExtendedMetaData(const QString &key, const QVariant &value)
-    {
-        m_extendedData.insert(key, value);
-    }
-
-    QStringList availableExtendedMetaData() const { return m_extendedData.keys(); }
-
     using QMetaDataWriterControl::metaDataChanged;
 
     void populateMetaData()
@@ -100,8 +92,7 @@ public:
 
     bool m_available;
     bool m_writable;
-    QMap<QtMultimedia::MetaData, QVariant> m_data;
-    QMap<QString, QVariant> m_extendedData;
+    QMap<QString, QVariant> m_data;
 };
 
 #endif // MOCKMETADATAWRITERCONTROL_H