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/qdoc/cppcodeparser.cpp | |
| 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/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index f6f2eb5f2..6d5ec5af0 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -151,8 +151,10 @@ void CppCodeParser::initializeParser(const Config &config) CONFIG_EXAMPLES + Config::dot + CONFIG_FILEEXTENSIONS); // Used for excluding dirs and files from the list of example files - excludeDirs = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEDIRS)); - excludeFiles = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEFILES)); + const auto &excludeDirsList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS); + excludeDirs = QSet<QString>(excludeDirsList.cbegin(), excludeDirsList.cend()); + const auto &excludeFilesList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS); + excludeFiles = QSet<QString>(excludeFilesList.cbegin(), excludeFilesList.cend()); if (!exampleFilePatterns.isEmpty()) exampleNameFilter = exampleFilePatterns.join(' '); @@ -706,7 +708,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc, */ void CppCodeParser::processMetaCommands(const Doc &doc, Node *node) { - QStringList metaCommandsUsed = doc.metaCommandsUsed().toList(); + QStringList metaCommandsUsed = doc.metaCommandsUsed().values(); metaCommandsUsed.sort(); // TODO: why are these sorted? mws 24/12/2018 QStringList::ConstIterator cmd = metaCommandsUsed.constBegin(); while (cmd != metaCommandsUsed.constEnd()) { |