Replace obsoleted functions

qSort is obsoleted and std::sort should be used instead. Also QHash
insertMulti is obsoleted and QMultiHash should be used instead.

Change-Id: Ie4a44355d25d44943a4eeefc2842b4af3e126101
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

8 files changed, 57 insertions, 57 deletions

diff --git a/src/libs/ifwtools/rcc/rcc.cpp b/src/libs/ifwtools/rcc/rcc.cpp
index 12f399937..16203e2cd 100644
--- a/src/libs/ifwtools/rcc/rcc.cpp
+++ b/src/libs/ifwtools/rcc/rcc.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -108,7 +108,7 @@ public:
     QLocale::Country m_country;
     QFileInfo m_fileInfo;
     RCCFileInfo *m_parent;
-    QHash<QString, RCCFileInfo*> m_children;
+    QMultiHash<QString, RCCFileInfo*> m_children;
     int m_compressLevel;
     int m_compressThreshold;
 
@@ -583,10 +583,10 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
         if (!parent->m_children.contains(node)) {
             RCCFileInfo *s = new RCCFileInfo(node, QFileInfo(), QLocale::C, QLocale::AnyCountry, RCCFileInfo::Directory);
             s->m_parent = parent;
-            parent->m_children.insert(node, s);
+            parent->m_children.replace(node, s);
             parent = s;
         } else {
-            parent = parent->m_children[node];
+            parent = parent->m_children.value(node);
         }
     }
 
@@ -598,7 +598,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
             qWarning("%s: Warning: potential duplicate alias detected: '%s'",
                      qPrintable(fileName), qPrintable(filename));
         }
-    parent->m_children.insertMulti(filename, s);
+    parent->m_children.insert(filename, s);
     return true;
 }
 
@@ -894,7 +894,7 @@ bool RCCResourceLibrary::writeDataStructure()
 
         //sort by hash value for binary lookup
         QList<RCCFileInfo*> m_children = file->m_children.values();
-        qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash);
+        std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash);
 
         //write out the actual data now
         for (int i = 0; i < m_children.size(); ++i) {
@@ -913,7 +913,7 @@ bool RCCResourceLibrary::writeDataStructure()
 
         //sort by hash value for binary lookup
         QList<RCCFileInfo*> m_children = file->m_children.values();
-        qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash);
+        std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash);
 
         //write out the actual data now
         for (int i = 0; i < m_children.size(); ++i) {
diff --git a/src/libs/installer/componentmodel.cpp b/src/libs/installer/componentmodel.cpp
index 3862f8dc5..dcecf74ce 100644
--- a/src/libs/installer/componentmodel.cpp
+++ b/src/libs/installer/componentmodel.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -559,10 +559,10 @@ static Qt::CheckState verifyPartiallyChecked(Component *component)
 QSet<QModelIndex> ComponentModel::updateCheckedState(const ComponentSet &components, Qt::CheckState state)
 {
     // get all parent nodes for the components we're going to update
-    QMap<QString, Component *> sortedNodesMap;
+    QMultiMap<QString, Component *> sortedNodesMap;
     foreach (Component *component, components) {
         while (component && !sortedNodesMap.values(component->treeName()).contains(component)) {
-            sortedNodesMap.insertMulti(component->treeName(), component);
+            sortedNodesMap.insert(component->treeName(), component);
             component = component->parentComponent();
         }
     }
diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp
index d9f1e3432..1b9f81ecc 100644
--- a/src/libs/installer/downloadfiletask.cpp
+++ b/src/libs/installer/downloadfiletask.cpp
@@ -1,7 +1,7 @@
 
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -227,8 +227,8 @@ void Downloader::onFinished(QNetworkReply *reply)
                 QNetworkReply *const redirectReply = startDownload(taskItem);
 
                 foreach (const QUrl &redirect, redirects)
-                    m_redirects.insertMulti(redirectReply, redirect);
-                m_redirects.insertMulti(redirectReply, url);
+                    m_redirects.insert(redirectReply, redirect);
+                m_redirects.insert(redirectReply, url);
 
                 m_downloads.erase(reply);
                 m_redirects.remove(reply);
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 68a242ebc..50fd723ab 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -678,7 +678,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
             //Hash metadata to help checking if meta for repository is already fetched
             ArchiveMetadata archiveMetadata;
             archiveMetadata.metaData = metadata;
-            m_fetchedArchive.insertMulti(metadata.repository.categoryname(), archiveMetadata);
+            m_fetchedArchive.insert(metadata.repository.categoryname(), archiveMetadata);
 
             //Check if other categories have the same url (contains same metadata)
             //so we can speed up other category fetches
@@ -686,7 +686,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                 if (category.displayname() != metadata.repository.categoryname()) {
                     foreach (Repository repository, category.repositories()) {
                         if (repository.url() == metadata.repository.url()) {
-                            m_fetchedArchive.insertMulti(category.displayname(), archiveMetadata);
+                            m_fetchedArchive.insert(category.displayname(), archiveMetadata);
                         }
                     }
                 }
@@ -789,7 +789,7 @@ bool MetadataJob::parsePackageUpdate(const QDomNodeList &c2, QString &packageNam
 QHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepositories
     (const QDomNode &repositoryUpdate, const FileTaskResult &result, const Metadata &metadata)
 {
-    QHash<QString, QPair<Repository, Repository> > repositoryUpdates;
+    QMultiHash<QString, QPair<Repository, Repository> > repositoryUpdates;
     const QDomNodeList children = repositoryUpdate.toElement().childNodes();
     for (int i = 0; i < children.count(); ++i) {
         const QDomElement el = children.at(i).toElement();
@@ -802,14 +802,14 @@ QHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepo
                 repository.setPassword(el.attribute(QLatin1String("password")));
                 repository.setDisplayName(el.attribute(QLatin1String("displayname")));
                 if (ProductKeyCheck::instance()->isValidRepository(repository)) {
-                    repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
+                    repositoryUpdates.insert(action, qMakePair(repository, Repository()));
                     qDebug() << "Repository to add:" << repository.displayname();
                 }
             } else if (action == QLatin1String("remove")) {
                 // remove possible default repositories using the given server url
                 Repository repository(resolveUrl(result, el.attribute(QLatin1String("url"))), true);
                 repository.setDisplayName(el.attribute(QLatin1String("displayname")));
-                repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
+                repositoryUpdates.insert(action, qMakePair(repository, Repository()));
 
                 qDebug() << "Repository to remove:" << repository.displayname();
             } else if (action == QLatin1String("replace")) {
@@ -822,7 +822,7 @@ QHash<QString, QPair<Repository, Repository> > MetadataJob::searchAdditionalRepo
 
                 if (ProductKeyCheck::instance()->isValidRepository(newRepository)) {
                     // store the new repository and the one old it replaces
-                    repositoryUpdates.insertMulti(action, qMakePair(newRepository, oldRepository));
+                    repositoryUpdates.insert(action, qMakePair(newRepository, oldRepository));
                     qDebug() << "Replace repository" << oldRepository.displayname() << "with"
                         << newRepository.displayname();
                 }
diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h
index eb0e91a4f..3ee6ccf46 100644
--- a/src/libs/installer/metadatajob.h
+++ b/src/libs/installer/metadatajob.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -127,7 +127,7 @@ private:
     int m_taskNumber;
     int m_totalTaskCount;
     QStringList m_shaMissmatchPackages;
-    QHash<QString, ArchiveMetadata> m_fetchedArchive;
+    QMultiHash<QString, ArchiveMetadata> m_fetchedArchive;
     QHash<QString, Metadata> m_metaFromDefaultRepositories;
     QHash<QString, Metadata> m_metaFromArchive; //for faster lookups.
 };
diff --git a/src/libs/installer/repositorycategory.cpp b/src/libs/installer/repositorycategory.cpp
index 0b875b27a..e651b7f0c 100644
--- a/src/libs/installer/repositorycategory.cpp
+++ b/src/libs/installer/repositorycategory.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -128,7 +128,7 @@ void RepositoryCategory::setRepositories(const QSet<Repository> repositories, co
         m_data.remove(scRepositories);
 
     foreach (const Repository &repository, repositories)
-        m_data.insertMulti(scRepositories, QVariant().fromValue(repository));
+        m_data.insert(scRepositories, QVariant().fromValue(repository));
 }
 
 /*!
@@ -136,7 +136,7 @@ void RepositoryCategory::setRepositories(const QSet<Repository> repositories, co
 */
 void RepositoryCategory::addRepository(const Repository &repository)
 {
-    m_data.insertMulti(scRepositories, QVariant().fromValue(repository));
+    m_data.insert(scRepositories, QVariant().fromValue(repository));
 }
 
 /*!
diff --git a/src/libs/installer/repositorycategory.h b/src/libs/installer/repositorycategory.h
index 51dc3ddfb..dc45527eb 100644
--- a/src/libs/installer/repositorycategory.h
+++ b/src/libs/installer/repositorycategory.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -69,7 +69,7 @@ public:
     friend INSTALLER_EXPORT QDataStream &operator<<(QDataStream &ostream, const RepositoryCategory &repository);
 
 private:
-    QVariantHash m_data;
+    QMultiHash<QString, QVariant> m_data;
     QString m_displayname;
     QString m_tooltip;
     bool m_enabled;
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index c64a33382..0b94e57a6 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -229,7 +229,7 @@ public:
         : m_replacementRepos(false)
     {}
 
-    QVariantHash m_data;
+    QMultiHash<QString, QVariant> m_data;
     bool m_replacementRepos;
 
     QString absolutePathFromKey(const QString &key, const QString &suffix = QString()) const
@@ -307,7 +307,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
                 << scSaveDefaultRepositories << scRepositoryCategories;
 
     Settings s;
-    s.d->m_data.insert(scPrefix, prefix);
+    s.d->m_data.replace(scPrefix, prefix);
     while (reader.readNextStartElement()) {
         const QString name = reader.name().toString();
         if (!elementList.contains(name))
@@ -336,7 +336,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
                 s.setRepositoryCategoryDisplayName(repositoryCategoryName);
             }
         } else {
-            s.d->m_data.insert(name, reader.readElementText(QXmlStreamReader::SkipChildElements));
+            s.d->m_data.replace(name, reader.readElementText(QXmlStreamReader::SkipChildElements));
         }
     }
     if (reader.error() != QXmlStreamReader::NoError) {
@@ -351,39 +351,39 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
 
     // Add some possible missing values
     if (!s.d->m_data.contains(scInstallerApplicationIcon))
-        s.d->m_data.insert(scInstallerApplicationIcon, QLatin1String(":/installer"));
+        s.d->m_data.replace(scInstallerApplicationIcon, QLatin1String(":/installer"));
     if (!s.d->m_data.contains(scInstallerWindowIcon)) {
-        s.d->m_data.insert(scInstallerWindowIcon,
+        s.d->m_data.replace(scInstallerWindowIcon,
                            QString(QLatin1String(":/installer") + s.systemIconSuffix()));
     }
     if (!s.d->m_data.contains(scRemoveTargetDir))
-        s.d->m_data.insert(scRemoveTargetDir, scTrue);
+        s.d->m_data.replace(scRemoveTargetDir, scTrue);
     if (s.d->m_data.value(scMaintenanceToolName).toString().isEmpty()) {
-        s.d->m_data.insert(scMaintenanceToolName,
+        s.d->m_data.replace(scMaintenanceToolName,
             // TODO: Remove deprecated 'UninstallerName'.
             s.d->m_data.value(QLatin1String("UninstallerName"), QLatin1String("maintenancetool"))
             .toString());
     }
     if (s.d->m_data.value(scTargetConfigurationFile).toString().isEmpty())
-        s.d->m_data.insert(scTargetConfigurationFile, QLatin1String("components.xml"));
+        s.d->m_data.replace(scTargetConfigurationFile, QLatin1String("components.xml"));
     if (s.d->m_data.value(scMaintenanceToolIniFile).toString().isEmpty()) {
-        s.d->m_data.insert(scMaintenanceToolIniFile,
+        s.d->m_data.replace(scMaintenanceToolIniFile,
             // TODO: Remove deprecated 'UninstallerIniFile'.
             s.d->m_data.value(QLatin1String("UninstallerIniFile"), QString(s.maintenanceToolName()
             + QLatin1String(".ini"))).toString());
     }
     if (!s.d->m_data.contains(scDependsOnLocalInstallerBinary))
-        s.d->m_data.insert(scDependsOnLocalInstallerBinary, false);
+        s.d->m_data.replace(scDependsOnLocalInstallerBinary, false);
     if (!s.d->m_data.contains(scRepositorySettingsPageVisible))
-        s.d->m_data.insert(scRepositorySettingsPageVisible, true);
+        s.d->m_data.replace(scRepositorySettingsPageVisible, true);
     if (!s.d->m_data.contains(scCreateLocalRepository))
-        s.d->m_data.insert(scCreateLocalRepository, false);
+        s.d->m_data.replace(scCreateLocalRepository, false);
     if (!s.d->m_data.contains(scInstallActionColumnVisible))
-        s.d->m_data.insert(scInstallActionColumnVisible, false);
+        s.d->m_data.replace(scInstallActionColumnVisible, false);
     if (!s.d->m_data.contains(scAllowUnstableComponents))
-        s.d->m_data.insert(scAllowUnstableComponents, false);
+        s.d->m_data.replace(scAllowUnstableComponents, false);
     if (!s.d->m_data.contains(scSaveDefaultRepositories))
-        s.d->m_data.insert(scSaveDefaultRepositories, true);
+        s.d->m_data.replace(scSaveDefaultRepositories, true);
     return s;
 }
 
@@ -515,7 +515,7 @@ QStringList Settings::productImages() const
 
 void Settings::setProductImages(const QStringList &images)
 {
-    d->m_data.insert(scProductImages, images);
+    d->m_data.replace(scProductImages, images);
 }
 
 QString Settings::installerApplicationIcon() const
@@ -569,7 +569,7 @@ QStringList Settings::runProgramArguments() const
 
 void Settings::setRunProgramArguments(const QStringList &arguments)
 {
-    d->m_data.insert(scRunProgramArguments, arguments);
+    d->m_data.replace(scRunProgramArguments, arguments);
 }
 
 
@@ -676,7 +676,7 @@ void Settings::setDefaultRepositories(const QSet<Repository> &repositories)
 void Settings::addDefaultRepositories(const QSet<Repository> &repositories)
 {
     foreach (const Repository &repository, repositories)
-        d->m_data.insertMulti(scRepositories, QVariant().fromValue(repository));
+        d->m_data.insert(scRepositories, QVariant().fromValue(repository));
 }
 
 void Settings::setRepositoryCategories(const QSet<RepositoryCategory> &repositories)
@@ -688,7 +688,7 @@ void Settings::setRepositoryCategories(const QSet<RepositoryCategory> &repositor
 void Settings::addRepositoryCategories(const QSet<RepositoryCategory> &repositories)
 {
     foreach (const RepositoryCategory &repository, repositories)
-        d->m_data.insertMulti(scRepositoryCategories, QVariant().fromValue(repository));
+        d->m_data.insert(scRepositoryCategories, QVariant().fromValue(repository));
 }
 
 Settings::Update Settings::updateRepositoryCategories(const RepoHash &updates)
@@ -786,7 +786,7 @@ void Settings::addTemporaryRepositories(const QSet<Repository> &repositories, bo
 {
     d->m_replacementRepos = replace;
     foreach (const Repository &repository, repositories)
-        d->m_data.insertMulti(scTmpRepositories, QVariant().fromValue(repository));
+        d->m_data.insert(scTmpRepositories, QVariant().fromValue(repository));
 }
 
 QSet<Repository> Settings::userRepositories() const
@@ -803,7 +803,7 @@ void Settings::setUserRepositories(const QSet<Repository> &repositories)
 void Settings::addUserRepositories(const QSet<Repository> &repositories)
 {
     foreach (const Repository &repository, repositories)
-        d->m_data.insertMulti(scUserRepositories, QVariant().fromValue(repository));
+        d->m_data.insert(scUserRepositories, QVariant().fromValue(repository));
 }
 
 Settings::Update Settings::updateUserRepositories(const RepoHash &updates)
@@ -848,7 +848,7 @@ bool Settings::repositorySettingsPageVisible() const
 
 void Settings::setRepositorySettingsPageVisible(bool visible)
 {
-    d->m_data.insert(scRepositorySettingsPageVisible, visible);
+    d->m_data.replace(scRepositorySettingsPageVisible, visible);
 }
 
 Settings::ProxyType Settings::proxyType() const
@@ -858,7 +858,7 @@ Settings::ProxyType Settings::proxyType() const
 
 void Settings::setProxyType(Settings::ProxyType type)
 {
-    d->m_data.insert(scProxyType, type);
+    d->m_data.replace(scProxyType, type);
 }
 
 QNetworkProxy Settings::ftpProxy() const
@@ -871,7 +871,7 @@ QNetworkProxy Settings::ftpProxy() const
 
 void Settings::setFtpProxy(const QNetworkProxy &proxy)
 {
-    d->m_data.insert(scFtpProxy, QVariant::fromValue(proxy));
+    d->m_data.replace(scFtpProxy, QVariant::fromValue(proxy));
 }
 
 QNetworkProxy Settings::httpProxy() const
@@ -884,7 +884,7 @@ QNetworkProxy Settings::httpProxy() const
 
 void Settings::setHttpProxy(const QNetworkProxy &proxy)
 {
-    d->m_data.insert(scHttpProxy, QVariant::fromValue(proxy));
+    d->m_data.replace(scHttpProxy, QVariant::fromValue(proxy));
 }
 
 QStringList Settings::translations() const
@@ -897,7 +897,7 @@ QStringList Settings::translations() const
 
 void Settings::setTranslations(const QStringList &translations)
 {
-    d->m_data.insert(scTranslations, translations);
+    d->m_data.replace(scTranslations, translations);
 }
 
 QString Settings::controlScript() const
@@ -917,7 +917,7 @@ bool Settings::allowUnstableComponents() const
 
 void Settings::setAllowUnstableComponents(bool allow)
 {
-    d->m_data.insert(scAllowUnstableComponents, allow);
+    d->m_data.replace(scAllowUnstableComponents, allow);
 }
 
 bool Settings::saveDefaultRepositories() const
@@ -927,7 +927,7 @@ bool Settings::saveDefaultRepositories() const
 
 void Settings::setSaveDefaultRepositories(bool save)
 {
-    d->m_data.insert(scSaveDefaultRepositories, save);
+    d->m_data.replace(scSaveDefaultRepositories, save);
 }
 
 QString Settings::repositoryCategoryDisplayName() const
@@ -938,5 +938,5 @@ QString Settings::repositoryCategoryDisplayName() const
 
 void Settings::setRepositoryCategoryDisplayName(const QString& name)
 {
-    d->m_data.insert(scRepositoryCategoryDisplayName, name);
+    d->m_data.replace(scRepositoryCategoryDisplayName, name);
 }