diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-22 11:08:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-23 08:57:00 +0200 |
| commit | af0574a7f73f8815f0f276d8727f4cae74a4110a (patch) | |
| tree | fbfd0f1e84f58c2b9ed6d91088dac07306092df1 /src/assistant | |
| parent | fe5a157cbe37d2516ca69c92c4ec989ce77a25a2 (diff) | |
| download | qttools-af0574a7f73f8815f0f276d8727f4cae74a4110a.tar.gz | |
Fix deprecation warnings about deprecated container conversions
Fix warnings introduced by
qtbase/92f984273262531f909ede17a324f546fe502b5c.
Change-Id: Iaca85ad36591f7208f63305b885e7ff59c014a72
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/qhelpgenerator/helpgenerator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp index f5493a59b..feab1e2d5 100644 --- a/src/assistant/qhelpgenerator/helpgenerator.cpp +++ b/src/assistant/qhelpgenerator/helpgenerator.cpp @@ -428,14 +428,14 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString & return false; emit statusChanged(tr("Insert files...")); - QList<int> filterAtts; + QSet<int> filterAtts; for (const QString &filterAtt : filterAttributes) { m_query->prepare(QLatin1String("SELECT Id FROM FilterAttributeTable " "WHERE Name=?")); m_query->bindValue(0, filterAtt); m_query->exec(); if (m_query->next()) - filterAtts.append(m_query->value(0).toInt()); + filterAtts.insert(m_query->value(0).toInt()); } int filterSetId = -1; @@ -504,8 +504,8 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString & fileNameDataList.append(fileNameData); m_fileMap.insert(fileName, tableFileId); - m_fileFilterMap.insert(tableFileId, filterAtts.toSet()); - tmpFileFilterMap.insert(tableFileId, filterAtts.toSet()); + m_fileFilterMap.insert(tableFileId, filterAtts); + tmpFileFilterMap.insert(tableFileId, filterAtts); ++tableFileId; } else { @@ -525,7 +525,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString & if (!tmpFileFilterMap.isEmpty()) { m_query->exec(QLatin1String("BEGIN")); for (auto it = tmpFileFilterMap.cbegin(), end = tmpFileFilterMap.cend(); it != end; ++it) { - QList<int> filterValues = it.value().toList(); + QList<int> filterValues = it.value().values(); std::sort(filterValues.begin(), filterValues.end()); for (int fv : qAsConst(filterValues)) { m_query->prepare(QLatin1String("INSERT INTO FileFilterTable " |