diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
commit | 516492370b95e9c07cad4080ef713d5b2b3f2f94 (patch) | |
tree | c094d82a3cebf3aaff4182ae7824c3efbce6d3a3 /src/libs/installer/repositorycategory.cpp | |
parent | 3b310a3ec13a743ae2258bc43d92a5df42c6ad37 (diff) | |
parent | 8f7af86198935849c74c71add7c9ca081347fb85 (diff) |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
Diffstat (limited to 'src/libs/installer/repositorycategory.cpp')
-rw-r--r-- | src/libs/installer/repositorycategory.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/libs/installer/repositorycategory.cpp b/src/libs/installer/repositorycategory.cpp index 42fb41c99..ce06480c8 100644 --- a/src/libs/installer/repositorycategory.cpp +++ b/src/libs/installer/repositorycategory.cpp @@ -28,6 +28,7 @@ #include "repositorycategory.h" #include "filedownloaderfactory.h" +#include "constants.h" #include <QDataStream> #include <QFileInfo> @@ -102,16 +103,20 @@ void RepositoryCategory::setTooltip(const QString &tooltip) */ QSet<Repository> RepositoryCategory::repositories() const { - return variantListToSet<Repository>(m_data.values(QLatin1String("Repositories"))); + return variantListToSet<Repository>(m_data.values(scRepositories)); } /*! - Inserts a set of \a repositories to the category. + Inserts a set of \a repositories to the category. Removes old \a repositories + if \a replace is set to \c true. */ -void RepositoryCategory::setRepositories(const QSet<Repository> repositories) +void RepositoryCategory::setRepositories(const QSet<Repository> repositories, const bool replace) { + if (replace) + m_data.remove(scRepositories); + foreach (const Repository &repository, repositories) - m_data.insertMulti(QLatin1String("Repositories"), QVariant().fromValue(repository)); + m_data.insertMulti(scRepositories, QVariant().fromValue(repository)); } /*! @@ -119,7 +124,7 @@ void RepositoryCategory::setRepositories(const QSet<Repository> repositories) */ void RepositoryCategory::addRepository(const Repository repository) { - m_data.insertMulti(QLatin1String("Repositories"), QVariant().fromValue(repository)); + m_data.insertMulti(scRepositories, QVariant().fromValue(repository)); } /*! |