diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-26 13:18:26 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-27 07:45:06 +0000 |
commit | 19239e3770113af44b3bb319c2c6a3660656f7c8 (patch) | |
tree | c9dae8712324c908cc4955043dee749315dfbe0e /src/libs/qmljs | |
parent | c2ebce684928c47612debf821aa16252a39ba197 (diff) |
QmlJs: use initilizer_lists for pairs
Change-Id: I0386d57ad3549814ab197c4e24549705e061c95a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/libs/qmljs')
-rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 6 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.h | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsqrcparser.cpp | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index c88e57549e3..bd7073ead8f 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -1397,11 +1397,11 @@ bool Check::visit(CaseBlock *ast) { QList< QPair<SourceLocation, StatementList *> > clauses; for (CaseClauses *it = ast->clauses; it; it = it->next) - clauses += qMakePair(it->clause->caseToken, it->clause->statements); + clauses += {it->clause->caseToken, it->clause->statements}; if (ast->defaultClause) - clauses += qMakePair(ast->defaultClause->defaultToken, ast->defaultClause->statements); + clauses += {ast->defaultClause->defaultToken, ast->defaultClause->statements}; for (CaseClauses *it = ast->moreClauses; it; it = it->next) - clauses += qMakePair(it->clause->caseToken, it->clause->statements); + clauses += {it->clause->caseToken, it->clause->statements}; // check all but the last clause for fallthrough for (int i = 0; i < clauses.size() - 1; ++i) { diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 65a47b2bd99..e5506224bf3 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -1232,7 +1232,7 @@ void ModelManagerInterface::queueCppQmlTypeUpdate(const CPlusPlus::Document::Ptr QPair<CPlusPlus::Document::Ptr, bool> prev = m_queuedCppDocuments.value(doc->fileName()); if (prev.first && prev.second) prev.first->releaseSourceAndAST(); - m_queuedCppDocuments.insert(doc->fileName(), qMakePair(doc, scan)); + m_queuedCppDocuments.insert(doc->fileName(), {doc, scan}); m_updateCppQmlTypesTimer->start(); } diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 193bd5b2d35..98174de4f95 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -107,7 +107,7 @@ public: typedef QHash<QString, QPair<QString, int> > Table; void insert(const QString &fileName, const QString &source, int revision = 0) - { _elements.insert(fileName, qMakePair(source, revision)); } + { _elements.insert(fileName, {source, revision}); } bool contains(const QString &fileName) const { return _elements.contains(fileName); } diff --git a/src/libs/qmljs/qmljsqrcparser.cpp b/src/libs/qmljs/qmljsqrcparser.cpp index 6242391da3e..bd5d5b7e034 100644 --- a/src/libs/qmljs/qmljsqrcparser.cpp +++ b/src/libs/qmljs/qmljsqrcparser.cpp @@ -487,7 +487,7 @@ QrcParser::Ptr QrcCachePrivate::addPath(const QString &path, const QString &cont QPair<QrcParser::Ptr,int> currentValue; { QMutexLocker l(&m_mutex); - currentValue = m_cache.value(path, qMakePair(QrcParser::Ptr(0), 0)); + currentValue = m_cache.value(path, {QrcParser::Ptr(0), 0}); currentValue.second += 1; if (currentValue.second > 1) { m_cache.insert(path, currentValue); @@ -499,7 +499,7 @@ QrcParser::Ptr QrcCachePrivate::addPath(const QString &path, const QString &cont qCWarning(qmljsLog) << "adding invalid qrc " << path << " to the cache:" << newParser->errorMessages(); { QMutexLocker l(&m_mutex); - QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, qMakePair(QrcParser::Ptr(0), 0)); + QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, {QrcParser::Ptr(0), 0}); if (currentValue.first.isNull()) currentValue.first = newParser; currentValue.second += 1; @@ -513,7 +513,7 @@ void QrcCachePrivate::removePath(const QString &path) QPair<QrcParser::Ptr,int> currentValue; { QMutexLocker l(&m_mutex); - currentValue = m_cache.value(path, qMakePair(QrcParser::Ptr(0), 0)); + currentValue = m_cache.value(path, {QrcParser::Ptr(0), 0}); if (currentValue.second == 1) { m_cache.remove(path); } else if (currentValue.second > 1) { @@ -530,7 +530,7 @@ QrcParser::Ptr QrcCachePrivate::updatePath(const QString &path, const QString &c QrcParser::Ptr newParser = QrcParser::parseQrcFile(path, contents); { QMutexLocker l(&m_mutex); - QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, qMakePair(QrcParser::Ptr(0), 0)); + QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, {QrcParser::Ptr(0), 0}); currentValue.first = newParser; if (currentValue.second == 0) currentValue.second = 1; // add qrc files that are not in the resources of a project @@ -542,7 +542,7 @@ QrcParser::Ptr QrcCachePrivate::updatePath(const QString &path, const QString &c QrcParser::Ptr QrcCachePrivate::parsedPath(const QString &path) { QMutexLocker l(&m_mutex); - QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, qMakePair(QrcParser::Ptr(0), 0)); + QPair<QrcParser::Ptr,int> currentValue = m_cache.value(path, {QrcParser::Ptr(0), 0}); return currentValue.first; } |