Adapt to changes in QHash and QSet

Task-number: QTIFW-1829
Change-Id: I5f062ae4c6389aba57b1de6f0e1884b4cd301334
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

9 files changed, 24 insertions, 21 deletions

diff --git a/src/libs/ifwtools/rcc/rcc.cpp b/src/libs/ifwtools/rcc/rcc.cpp
index 2375c48ea..caef84433 100644
--- a/src/libs/ifwtools/rcc/rcc.cpp
+++ b/src/libs/ifwtools/rcc/rcc.cpp
@@ -664,7 +664,7 @@ QStringList RCCResourceLibrary::dataFiles() const
     pending.push(m_root);
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
+        for (QMultiHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
             it != file->m_children.end(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
@@ -678,7 +678,7 @@ QStringList RCCResourceLibrary::dataFiles() const
 // Determine map of resource identifier (':/newPrefix/images/p1.png') to file via recursion
 static void resourceDataFileMapRecursion(const RCCFileInfo *m_root, const QString &path, RCCResourceLibrary::ResourceDataFileMap &m)
 {
-    typedef QHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator;
+    typedef QMultiHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator;
     const QChar slash = QLatin1Char('/');
     const ChildConstIterator cend = m_root->m_children.constEnd();
     for (ChildConstIterator it = m_root->m_children.constBegin(); it != cend; ++it) {
@@ -815,7 +815,7 @@ bool RCCResourceLibrary::writeDataBlobs()
     QString errorMessage;
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
+        for (QMultiHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
             it != file->m_children.end(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
@@ -851,7 +851,7 @@ bool RCCResourceLibrary::writeDataNames()
     qint64 offset = 0;
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
+        for (QMultiHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
             it != file->m_children.end(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index 633d283bb..2147a8978 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -89,7 +89,7 @@ TempPathDeleter::~TempPathDeleter()
 
 QStringList TempPathDeleter::paths() const
 {
-    return m_paths.toList();
+    return m_paths.values();
 }
 
 void TempPathDeleter::add(const QString &path)
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 33aabd268..3bb47ca8b 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -468,7 +468,7 @@ void MetadataJob::xmlTaskFinished()
                     temporaries.insert(replacement);
                     s.addTemporaryRepositories(temporaries, true);
                 } else {
-                    QHash<QString, QPair<Repository, Repository> > update;
+                    QMultiHash<QString, QPair<Repository, Repository> > update;
                     update.insert(QLatin1String("replace"), qMakePair(original, replacement));
 
                     if (s.updateRepositoryCategories(update) == Settings::UpdatesApplied)
@@ -891,7 +891,7 @@ MetadataJob::Status MetadataJob::parseRepositoryUpdates(const QDomElement &root,
     MetadataJob::Status status = XmlDownloadSuccess;
     const QDomNode repositoryUpdate = root.firstChildElement(QLatin1String("RepositoryUpdate"));
     if (!repositoryUpdate.isNull()) {
-        const QHash<QString, QPair<Repository, Repository> > repositoryUpdates
+        const QMultiHash<QString, QPair<Repository, Repository> > repositoryUpdates
             = searchAdditionalRepositories(repositoryUpdate, result, *metadata);
         if (!repositoryUpdates.isEmpty())
             status = setAdditionalRepositories(repositoryUpdates, result, *metadata);
@@ -964,7 +964,7 @@ bool MetadataJob::parsePackageUpdate(const QDomNodeList &c2, QString &packageNam
     return metaFound;
 }
 
-QHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepositories
+QMultiHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepositories
     (const QDomNode &repositoryUpdate, const FileTaskResult &result, const Metadata &metadata)
 {
     QMultiHash<QString, QPair<Repository, Repository> > repositoryUpdates;
@@ -1013,7 +1013,7 @@ QHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepo
     return repositoryUpdates;
 }
 
-MetadataJob::Status MetadataJob::setAdditionalRepositories(QHash<QString, QPair<Repository, Repository> > repositoryUpdates,
+MetadataJob::Status MetadataJob::setAdditionalRepositories(QMultiHash<QString, QPair<Repository, Repository> > repositoryUpdates,
                                             const FileTaskResult &result, const Metadata& metadata)
 {
     MetadataJob::Status status = XmlDownloadSuccess;
diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h
index 18554ca08..d2207ea38 100644
--- a/src/libs/installer/metadatajob.h
+++ b/src/libs/installer/metadatajob.h
@@ -104,9 +104,9 @@ private:
                          const QString &sha1, const QString &packageName);
     static bool parsePackageUpdate(const QDomNodeList &c2, QString &packageName, QString &packageVersion,
                             QString &packageHash, bool online, bool testCheckSum);
-    QHash<QString, QPair<Repository, Repository> > searchAdditionalRepositories(const QDomNode &repositoryUpdate,
+    QMultiHash<QString, QPair<Repository, Repository> > searchAdditionalRepositories(const QDomNode &repositoryUpdate,
                             const FileTaskResult &result, const Metadata &metadata);
-    MetadataJob::Status setAdditionalRepositories(QHash<QString, QPair<Repository, Repository> > repositoryUpdates,
+    MetadataJob::Status setAdditionalRepositories(QMultiHash<QString, QPair<Repository, Repository> > repositoryUpdates,
                             const FileTaskResult &result, const Metadata& metadata);
 
 private:
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 8575fd271..642f13b03 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -4325,7 +4325,8 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
         }
 
         // store all components that got a replacement, but do not modify the components list
-        storeReplacedComponents(localReplaceMes.unite(components), data);
+        localReplaceMes.insert(components);
+        storeReplacedComponents(localReplaceMes, data);
 
         if (!components.isEmpty()) {
             // append all components w/o parent to the direct list
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 759ea6bf3..52d66ff6b 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -505,8 +505,10 @@ void PackageManagerCorePrivate::clearAllComponentLists()
 
 void PackageManagerCorePrivate::clearUpdaterComponentLists()
 {
-    QSet<Component*> usedComponents =
-        QSet<Component*>::fromList(m_updaterComponents + m_updaterComponentsDeps);
+
+    QSet<Component*> usedComponents(m_updaterComponents.begin(), m_updaterComponents.end());
+    usedComponents.unite(QSet<Component*>(m_updaterComponentsDeps.begin(),
+                                          m_updaterComponentsDeps.end()));
 
     const QList<QPair<Component*, Component*> > list = m_componentsToReplaceUpdaterMode.values();
     for (int i = 0; i < list.count(); ++i) {
diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp
index f72e67867..a29e99f94 100644
--- a/src/libs/installer/qtpatch.cpp
+++ b/src/libs/installer/qtpatch.cpp
@@ -67,11 +67,11 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
         QFileInfo qmake(qmakePath);
 
         if (!qmake.exists()) {
-            qmakeOutput->append(QString::fromLatin1("%1 is not existing").arg(qmakePath));
+            qmakeOutput->append(QString::fromLatin1("%1 is not existing").arg(qmakePath).toUtf8());
             return qmakeValueHash;
         }
         if (!qmake.isExecutable()) {
-            qmakeOutput->append(QString::fromLatin1("%1 is not executable").arg(qmakePath));
+            qmakeOutput->append(QString::fromLatin1("%1 is not executable").arg(qmakePath).toUtf8());
             return qmakeValueHash;
         }
 
@@ -88,7 +88,7 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
                     , QString::fromLatin1("Standard output: \"%1\".").arg(QLatin1String(output))
                     , QString::fromLatin1("Error output: \"%1\".").arg(QLatin1String(process.readAllStandardError()))
                 };
-                qmakeOutput->append(detailedOutput.join(QLatin1Char('\n')));
+                qmakeOutput->append(detailedOutput.join(QLatin1Char('\n')).toUtf8());
                 return qmakeValueHash;
             }
             qmakeOutput->append(output);
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index df7d5f8cc..ae1adbedb 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -745,7 +745,7 @@ Settings::Update Settings::updateRepositoryCategories(const RepoHash &updates)
     return update ? Settings::UpdatesApplied : Settings::NoUpdatesApplied;
 }
 
-static bool apply(const RepoHash &updates, QHash<QUrl, Repository> *reposToUpdate)
+static bool apply(const RepoHash &updates, QMultiHash<QUrl, Repository> *reposToUpdate)
 {
     bool update = false;
     QList<QPair<Repository, Repository> > values = updates.values(QLatin1String("replace"));
@@ -783,7 +783,7 @@ Settings::Update Settings::updateDefaultRepositories(const RepoHash &updates)
     if (updates.isEmpty())
         return Settings::NoUpdatesApplied;
 
-    QHash <QUrl, Repository> defaultRepos;
+    QMultiHash <QUrl, Repository> defaultRepos;
     foreach (const QVariant &variant, d->m_data.values(scRepositories)) {
         const Repository repository = variant.value<Repository>();
         defaultRepos.insert(repository.url(), repository);
@@ -837,7 +837,7 @@ Settings::Update Settings::updateUserRepositories(const RepoHash &updates)
     if (updates.isEmpty())
         return Settings::NoUpdatesApplied;
 
-    QHash <QUrl, Repository> reposToUpdate;
+    QMultiHash <QUrl, Repository> reposToUpdate;
     foreach (const QVariant &variant, d->m_data.values(scUserRepositories)) {
         const Repository repository = variant.value<Repository>();
         reposToUpdate.insert(repository.url(), repository);
diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h
index ebb65a382..f98319110 100644
--- a/src/libs/installer/settings.h
+++ b/src/libs/installer/settings.h
@@ -42,7 +42,7 @@
 
 namespace QInstaller {
 class Repository;
-typedef QHash<QString, QPair<Repository, Repository> > RepoHash;
+typedef QMultiHash<QString, QPair<Repository, Repository> > RepoHash;
 
 class INSTALLER_EXPORT Settings
 {