Use QMultiHash where appropriate

Change-Id: I58e75ba3463415b7642a25345715609516e93aa1
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>

6 files changed, 12 insertions, 12 deletions

diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp
index 241a9e533..d1e06cfd4 100644
--- a/src/contacts/qcontactmanager_p.cpp
+++ b/src/contacts/qcontactmanager_p.cpp
@@ -62,7 +62,7 @@
 QT_BEGIN_NAMESPACE_CONTACTS
 
 /* Shared QContactManager stuff here, default engine stuff below */
-QHash<QString, QContactManagerEngineFactory*> QContactManagerData::m_engines;
+QMultiHash<QString, QContactManagerEngineFactory*> QContactManagerData::m_engines;
 QSet<QContactManager*> QContactManagerData::m_aliveEngines;
 QList<QContactActionManagerPlugin*> QContactManagerData::m_actionManagers;
 
@@ -167,7 +167,7 @@ void QContactManagerData::createEngine(const QString &managerName, const QMap<QS
                         builtManagerName) {
                     QContactManagerEngineFactory *managerFactory = qobject_cast<QContactManagerEngineFactory *>(l->instance(m_metaData.indexOf(metaDataObject)));
                     QContactActionManagerPlugin *actionFactory = qobject_cast<QContactActionManagerPlugin *>(l->instance(m_metaData.indexOf(metaDataObject)));
-                    m_engines.insertMulti(builtManagerName, managerFactory);
+                    m_engines.insert(builtManagerName, managerFactory);
                     m_actionManagers.append(actionFactory);
                 }
             }
@@ -218,7 +218,7 @@ void QContactManagerData::loadStaticFactories()
                     if (m_engines.keys().contains(name)) {
                         qWarning("Static contacts plugin %s has the same name as a currently loaded plugin; ignored", qPrintable(name));
                     } else {
-                        m_engines.insertMulti(name, f);
+                        m_engines.insert(name, f);
                     }
                 } else {
                     qWarning("Static contacts plugin with reserved name %s ignored", qPrintable(name));
diff --git a/src/contacts/qcontactmanager_p.h b/src/contacts/qcontactmanager_p.h
index 1ef5b3504..f19f7e5dc 100644
--- a/src/contacts/qcontactmanager_p.h
+++ b/src/contacts/qcontactmanager_p.h
@@ -102,7 +102,7 @@ public:
     QMap<int, QContactManager::Error> m_lastErrorMap;
 
     /* Manager plugins */
-    static QHash<QString, QContactManagerEngineFactory*> m_engines;
+    static QMultiHash<QString, QContactManagerEngineFactory*> m_engines;
     static QSet<QContactManager*> m_aliveEngines;
     static QContactManagerData* managerData(QContactManager *manager) {return manager->d;}
     static QContactManagerData* managerData(const QContactManager *manager) {return manager->d;} // laziness to avoid const_cast
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp
index d3e6f72d7..b067965d3 100644
--- a/src/organizer/qorganizermanager_p.cpp
+++ b/src/organizer/qorganizermanager_p.cpp
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE_ORGANIZER
 
-QHash<QString, QOrganizerManagerEngineFactory *> QOrganizerManagerData::m_engines;
+QMultiHash<QString, QOrganizerManagerEngineFactory *> QOrganizerManagerData::m_engines;
 bool QOrganizerManagerData::m_discovered;
 bool QOrganizerManagerData::m_discoveredStatic;
 QStringList QOrganizerManagerData::m_pluginPaths;
@@ -139,7 +139,7 @@ void QOrganizerManagerData::loadStaticFactories()
                     if (m_engines.keys().contains(name))
                         qWarning("Static organizeritems plugin %s has the same name as a currently loaded plugin; ignored", qPrintable(name));
                     else
-                        m_engines.insertMulti(name, f);
+                        m_engines.insert(name, f);
                 } else {
                     qWarning("Static organizeritems plugin with reserved name %s ignored", qPrintable(name));
                 }
@@ -177,7 +177,7 @@ void QOrganizerManagerData::loadFactories()
                     if (m_engines.keys().contains(name))
                         qWarning("Organizer plugin %s has the same name as currently loaded plugin %s; ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name));
                     else
-                        m_engines.insertMulti(name, f);
+                        m_engines.insert(name, f);
                 } else {
                     qWarning("Organizer plugin %s with reserved name %s ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name));
                 }
diff --git a/src/organizer/qorganizermanager_p.h b/src/organizer/qorganizermanager_p.h
index 3f3f00e5e..785324e47 100644
--- a/src/organizer/qorganizermanager_p.h
+++ b/src/organizer/qorganizermanager_p.h
@@ -97,7 +97,7 @@ public:
     QMap<int, QOrganizerManager::Error> m_lastErrorMap;
 
     // manager plugins
-    static QHash<QString, QOrganizerManagerEngineFactory *> m_engines;
+    static QMultiHash<QString, QOrganizerManagerEngineFactory *> m_engines;
     static bool m_discovered;
     static bool m_discoveredStatic;
     static QStringList m_pluginPaths;
diff --git a/src/plugins/contacts/memory/qcontactmemorybackend_p.h b/src/plugins/contacts/memory/qcontactmemorybackend_p.h
index 7a9c4d9f9..22ce7a650 100644
--- a/src/plugins/contacts/memory/qcontactmemorybackend_p.h
+++ b/src/plugins/contacts/memory/qcontactmemorybackend_p.h
@@ -103,7 +103,7 @@ public:
 
     QContactId m_selfContactId;               // the "MyCard" contact id
     QList<QContact> m_contacts;               // list of contacts
-    QHash<QContactCollectionId, QContactId> m_contactsInCollections;   // hash of contacts for each collection
+    QMultiHash<QContactCollectionId, QContactId> m_contactsInCollections; // hash of contacts for each collection
     QHash<QContactCollectionId, QContactCollection> m_idToCollectionHash; // hash of id to the collection identified by that id
     QList<QContactId> m_contactIds;           // list of contact Id's
     QList<QContactRelationship> m_relationships;   // list of contact relationships
diff --git a/src/versit/qversitproperty.cpp b/src/versit/qversitproperty.cpp
index e01b04464..b0999c011 100644
--- a/src/versit/qversitproperty.cpp
+++ b/src/versit/qversitproperty.cpp
@@ -162,8 +162,8 @@ uint qHash(const QVersitProperty &key)
     foreach (const QString& group, key.groups()) {
         hash += QT_PREPEND_NAMESPACE(qHash)(group);
     }
-    QHash<QString,QString>::const_iterator it = key.parameters().constBegin();
-    QHash<QString,QString>::const_iterator end = key.parameters().constEnd();
+    QMultiHash<QString,QString>::const_iterator it = key.parameters().constBegin();
+    QMultiHash<QString,QString>::const_iterator end = key.parameters().constEnd();
     while (it != end) {
         hash += QT_PREPEND_NAMESPACE(qHash)(it.key()) + QT_PREPEND_NAMESPACE(qHash)(it.value());
         ++it;
@@ -182,7 +182,7 @@ QDebug operator<<(QDebug dbg, const QVersitProperty& property)
         dbg.nospace() << group << '.';
     }
     dbg.nospace() << name;
-    QHash<QString,QString>::const_iterator it;
+    QMultiHash<QString,QString>::const_iterator it;
     for (it = parameters.constBegin(); it != parameters.constEnd(); ++it) {
         dbg.nospace() << ';' << it.key() << '=' << it.value();
     }