feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CPlusPlus: Limit the usage of qMakePair

Browse Source 
Change-Id: Ica59c320fb700369e968bb03a93deff34eb7ffb7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 13:17:36 +02:00
parent be9f6fea9b
commit afd1742f9f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/CppDocument.cpp
View File

@@ -792,7 +792,7 @@ QList<Snapshot::IncludeLocation> Snapshot::includeLocationsOfDocument(const QStr
const QList<Document::Include> includeFiles = doc->resolvedIncludes(); const QList<Document::Include> includeFiles = doc->resolvedIncludes();
for (const Document::Include &includeFile : includeFiles) { for (const Document::Include &includeFile : includeFiles) {
if (includeFile.resolvedFileName() == fileName) if (includeFile.resolvedFileName() == fileName)
result.append(qMakePair(doc, includeFile.line())); result.push_back({doc, includeFile.line()});
} }
} }
return result; return result;

2
src/libs/cplusplus/CppRewriter.cpp
View File

@@ -404,7 +404,7 @@ SubstitutionMap::~SubstitutionMap()
void SubstitutionMap::bind(const Name *name, const FullySpecifiedType &ty) void SubstitutionMap::bind(const Name *name, const FullySpecifiedType &ty)
{ {
_map.append(qMakePair(name, ty)); _map.push_back({name, ty});
} }
FullySpecifiedType SubstitutionMap::apply(const Name *name, Rewrite *) const FullySpecifiedType SubstitutionMap::apply(const Name *name, Rewrite *) const

2
src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
View File

@@ -389,7 +389,7 @@ FullySpecifiedType DeprecatedGenTemplateInstance::instantiate(const Name *classN
if (templArgName && templArgName->identifier()) { if (templArgName && templArgName->identifier()) {
const Identifier *templArgId = templArgName->identifier(); const Identifier *templArgId = templArgName->identifier();
subst.append(qMakePair(templArgId, templArgTy)); subst.push_back({templArgId, templArgTy});
} }
} }
} }

2
src/libs/cplusplus/pp-engine.cpp
View File

@@ -1420,7 +1420,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
trackedLine = tk.lineno; trackedLine = tk.lineno;
trackedColumn = unsigned(computeDistance(tk, true)); trackedColumn = unsigned(computeDistance(tk, true));
} }
m_state.m_expandedTokensInfo.append(qMakePair(trackedLine, trackedColumn)); m_state.m_expandedTokensInfo.push_back({trackedLine, trackedColumn});
} else if (m_state.m_expansionStatus == JustFinishedExpansion) { } else if (m_state.m_expansionStatus == JustFinishedExpansion) {
m_state.setExpansionStatus(NotExpanding); m_state.setExpansionStatus(NotExpanding);
macroExpanded = true; macroExpanded = true;