now using QMap

Josh Klontz
1 parent 35ab70c9
Showing 3 changed files with 6 additions and 6 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/output.cpp
@@ -58,7 +58,7 @@ QString File::hash() const
     return QtUtils::shortTextHash(flat());
 }
-void File::append(const QHash<QString, QVariant> &metadata)
+void File::append(const QMap<QString,QVariant> &metadata)
 {
     foreach (const QString &key, metadata.keys())
         set(key, metadata[key]);
@@ -164,8 +164,8 @@ struct BR_EXPORT File
     inline void clear() { name.clear(); m_metadata.clear(); } /*!< \brief Clears the file's name and metadata. */
     inline QList<QString> localKeys() const { return m_metadata.keys(); } /*!< \brief Returns the private metadata keys. */
-    inline QHash<QString,QVariant> localMetadata() const { return m_metadata; } /*!< \brief Returns the private metadata. */
-    void append(const QHash<QString,QVariant> &localMetadata); /*!< \brief Add new metadata fields. */
+    inline QMap<QString,QVariant> localMetadata() const { return m_metadata; } /*!< \brief Returns the private metadata. */
+    void append(const QMap<QString,QVariant> &localMetadata); /*!< \brief Add new metadata fields. */
     void append(const File &other); /*!< \brief Append another file using \c separator. */
     QList<File> split() const; /*!< \brief Split the file using \c separator. */
     QList<File> split(const QString &separator) const; /*!< \brief Split the file. */
@@ -181,7 +181,7 @@ struct BR_EXPORT File
     inline bool operator<=(const File &other) const { return name <= other.name; } /*!< \brief Compare name. */
     inline bool operator>(const File &other) const { return name > other.name; } /*!< \brief Compare name. */
     inline bool operator>=(const File &other) const { return name >= other.name; } /*!< \brief Compare name. */
-    inline File &operator+=(const QHash<QString,QVariant> &other) { append(other); return *this; } /*!< \brief Add new metadata fields. */
+    inline File &operator+=(const QMap<QString,QVariant> &other) { append(other); return *this; } /*!< \brief Add new metadata fields. */
     inline File &operator+=(const File &other) { append(other); return *this; } /*!< \brief Append another file using \c separator. */
     inline bool isNull() const { return name.isEmpty() && m_metadata.isEmpty(); } /*!< \brief Returns \c true if name and metadata are empty, \c false otherwise. */
@@ -238,7 +238,7 @@ struct BR_EXPORT File
     void setROIs(const QList<QRectF> &ROIs); /*!< \brief Assigns the file's landmark list. */
 private:
-    QHash<QString,QVariant> m_metadata;
+    QMap<QString,QVariant> m_metadata;
     BR_EXPORT friend QDataStream &operator<<(QDataStream &stream, const File &file); /*!< */
     BR_EXPORT friend QDataStream &operator>>(QDataStream &stream, File &file); /*!< */
@@ -106,7 +106,7 @@ class meltOutput : public MatrixOutput
         const bool genuineOnly = file.contains("Genuine") && !file.contains("Impostor");
         const bool impostorOnly = file.contains("Impostor") && !file.contains("Genuine");
-        QHash<QString,QVariant> args = file.localMetadata();
+        QMap<QString,QVariant> args = file.localMetadata();
         args.remove("Genuine");
         args.remove("Impostor");