diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 14 | ||||
-rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 4 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qmaintainingreader_tpl_p.h | 2 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdelement.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdinstancereader.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdschemachecker.cpp | 7 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdschemaparser.cpp | 20 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdschemaparsercontext.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdstatemachine_p.h | 2 | ||||
-rw-r--r-- | tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qxmlitem/tst_qxmlitem.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qxmlname/tst_qxmlname.cpp | 7 | ||||
-rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 6 |
16 files changed, 45 insertions, 36 deletions
diff --git a/.qmake.conf b/.qmake.conf index c29327d..a8a7769 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.1 +MODULE_VERSION = 5.14.0 diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 8455853..053e16a 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -40,8 +40,8 @@ #include "qqmlxmllistmodel_p.h" #include <qqmlcontext.h> +#include <qqmlfile.h> #include <private/qqmlengine_p.h> -#include <private/qv8engine_p.h> #include <private/qv4value_p.h> #include <private/qv4engine_p.h> #include <private/qv4object_p.h> @@ -276,12 +276,12 @@ int QQuickXmlQueryEngine::doQuery(QString query, QString namespaces, QByteArray { QMutexLocker m1(&m_mutex); m_queryIds.ref(); - if (m_queryIds.load() <= 0) - m_queryIds.store(1); + if (m_queryIds.loadRelaxed() <= 0) + m_queryIds.storeRelaxed(1); } XmlQueryJob job; - job.queryId = m_queryIds.load(); + job.queryId = m_queryIds.loadRelaxed(); job.data = data; job.query = QLatin1String("doc($src)") + query; job.namespaces = namespaces; @@ -922,13 +922,13 @@ void QQuickXmlListModel::setNamespaceDeclarations(const QString &declarations) var title = model.get(0).title; \endjs */ -QQmlV4Handle QQuickXmlListModel::get(int index) const +QJSValue QQuickXmlListModel::get(int index) const { // Must be called with a context and handle scope Q_D(const QQuickXmlListModel); if (index < 0 || index >= count()) - return QQmlV4Handle(Encode::undefined()); + return QJSValue(QJSValue::UndefinedValue); QQmlEngine *engine = qmlContext(this)->engine(); ExecutionEngine *v4engine = engine->handle(); @@ -942,7 +942,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const o->insertMember(name.getPointer(), value); } - return QQmlV4Handle(o); + return QJSValue(v4engine, o->asReturnedValue()); } /*! diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index 65f1299..ea3736a 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -53,11 +53,11 @@ #include <qqml.h> #include <qqmlinfo.h> +#include <qjsvalue.h> #include <QtCore/qurl.h> #include <QtCore/qstringlist.h> #include <QtCore/qabstractitemmodel.h> -#include <private/qv8engine_p.h> QT_BEGIN_NAMESPACE @@ -115,7 +115,7 @@ public: QString namespaceDeclarations() const; void setNamespaceDeclarations(const QString&); - Q_INVOKABLE QQmlV4Handle get(int index) const; + Q_INVOKABLE QJSValue get(int index) const; enum Status { Null, Ready, Loading, Error }; Q_ENUM(Status) diff --git a/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h b/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h index fae1818..e110520 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h @@ -177,7 +177,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku { QString translationString; - QList<typename TokenLookupClass::NodeName> all(desc.requiredAttributes.toList() + desc.optionalAttributes.toList()); + QList<typename TokenLookupClass::NodeName> all(desc.requiredAttributes.values() + desc.optionalAttributes.values()); const int totalCount = all.count(); QStringList allowed; diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index ea28c69..d7d642c 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -3070,7 +3070,7 @@ yytnamerr (char *yyres, const char *yystr) case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + Q_FALLTHROUGH(); default: if (yyres) yyres[yyn] = *yyp; diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp index 94d3610..141c084 100644 --- a/src/xmlpatterns/schema/qxsdelement.cpp +++ b/src/xmlpatterns/schema/qxsdelement.cpp @@ -236,7 +236,7 @@ void XsdElement::addSubstitutionGroup(const XsdElement::Ptr &element) XsdElement::List XsdElement::substitutionGroups() const { - return m_substitutionGroups.toList(); + return m_substitutionGroups.values(); } QT_END_NAMESPACE diff --git a/src/xmlpatterns/schema/qxsdinstancereader.cpp b/src/xmlpatterns/schema/qxsdinstancereader.cpp index 70c6fb9..18b7bc3 100644 --- a/src/xmlpatterns/schema/qxsdinstancereader.cpp +++ b/src/xmlpatterns/schema/qxsdinstancereader.cpp @@ -149,7 +149,10 @@ QString XsdInstanceReader::attribute(const QXmlName &name) const QSet<QXmlName> XsdInstanceReader::attributeNames() const { - return m_cachedAttributes.keys().toSet(); + QSet<QXmlName> result; + for (auto it = m_cachedAttributes.cbegin(), end = m_cachedAttributes.cend(); it != end; ++it) + result.insert(it.key()); + return result; } QString XsdInstanceReader::text() const diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp index 57ee3e6..91a796a 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker.cpp +++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp @@ -1525,11 +1525,14 @@ void XsdSchemaChecker::checkConstrainingFacets(const XsdFacet::Hash &facets, con const QXmlName primitiveTypeName = simpleType->primitiveType()->name(m_namePool); if (m_allowedAtomicFacets.contains(primitiveTypeName)) { const QSet<XsdFacet::Type> allowedFacets = m_allowedAtomicFacets.value(primitiveTypeName); - QSet<XsdFacet::Type> availableFacets = facets.keys().toSet(); + + QSet<XsdFacet::Type> availableFacets; + for (auto it = facets.cbegin(), end = facets.cend(); it != end; ++it) + availableFacets.insert(it.key()); if (!availableFacets.subtract(allowedFacets).isEmpty()) { m_context->error(QtXmlPatterns::tr("Simple type contains not allowed facet %1.") - .arg(formatKeyword(XsdFacet::typeName(availableFacets.toList().first()))), + .arg(formatKeyword(XsdFacet::typeName(availableFacets.values().constFirst()))), XsdSchemaContext::XSDError, sourceLocation(simpleType)); return; } diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp index 6c4eafe..9f11d69 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser.cpp +++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp @@ -5420,7 +5420,8 @@ XsdWildcard::Ptr XsdSchemaParser::parseAny(const XsdParticle::Ptr &particle) } if (hasAttribute(QString::fromLatin1("namespace"))) { - const QSet<QString> values = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts).toSet(); + const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts); + const QSet<QString> values(valueList.cbegin(), valueList.cend()); if ((values.contains(QString::fromLatin1("##any")) || values.contains(QString::fromLatin1("##other"))) && values.count() != 1) { error(QtXmlPatterns::tr("%1 attribute of %2 element must contain %3, %4 or a list of URIs.") .arg(formatAttribute("namespace")) @@ -5440,7 +5441,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAny(const XsdParticle::Ptr &particle) wildcard->namespaceConstraint()->setNamespaces(QSet<QString>() << XsdWildcard::absentNamespace()); } else { wildcard->namespaceConstraint()->setVariety(XsdWildcard::NamespaceConstraint::Enumeration); - QStringList newValues = values.toList(); + QStringList newValues = values.values(); // replace the ##targetNamespace entry for (int i = 0; i < newValues.count(); ++i) { @@ -5466,7 +5467,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAny(const XsdParticle::Ptr &particle) } } - wildcard->namespaceConstraint()->setNamespaces(newValues.toSet()); + wildcard->namespaceConstraint()->setNamespaces(QSet<QString>(newValues.cbegin(), newValues.cend())); } } else { wildcard->namespaceConstraint()->setVariety(XsdWildcard::NamespaceConstraint::Any); @@ -5532,7 +5533,8 @@ XsdWildcard::Ptr XsdSchemaParser::parseAnyAttribute() // parse attributes if (hasAttribute(QString::fromLatin1("namespace"))) { - const QSet<QString> values = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts).toSet(); + const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts); + const QSet<QString> values(valueList.cbegin(), valueList.cend()); if ((values.contains(QString::fromLatin1("##any")) || values.contains(QString::fromLatin1("##other"))) && values.count() != 1) { error(QtXmlPatterns::tr("%1 attribute of %2 element must contain %3, %4 or a list of URIs.") .arg(formatAttribute("namespace")) @@ -5552,7 +5554,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAnyAttribute() wildcard->namespaceConstraint()->setNamespaces(QSet<QString>() << XsdWildcard::absentNamespace()); } else { wildcard->namespaceConstraint()->setVariety(XsdWildcard::NamespaceConstraint::Enumeration); - QStringList newValues = values.toList(); + QStringList newValues = values.values(); // replace the ##targetNamespace entry for (int i = 0; i < newValues.count(); ++i) { @@ -5578,7 +5580,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAnyAttribute() } } - wildcard->namespaceConstraint()->setNamespaces(newValues.toSet()); + wildcard->namespaceConstraint()->setNamespaces(QSet<QString>(newValues.cbegin(), newValues.cend())); } } else { wildcard->namespaceConstraint()->setVariety(XsdWildcard::NamespaceConstraint::Any); @@ -5815,7 +5817,8 @@ SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttri content = m_finalDefault; } - QSet<QString> contentSet = content.split(QLatin1Char(' '), QString::SkipEmptyParts).toSet(); + const auto &contentList = content.split(QLatin1Char(' '), QString::SkipEmptyParts); + QSet<QString> contentSet(contentList.cbegin(), contentList.cend()); // if the '#all' tag is defined, we return all allowed values if (contentSet.contains(QString::fromLatin1("#all"))) { @@ -5876,7 +5879,8 @@ NamedSchemaComponent::BlockingConstraints XsdSchemaParser::readBlockingConstrain content = m_blockDefault; } - QSet<QString> contentSet = content.split(QLatin1Char(' '), QString::SkipEmptyParts).toSet(); + const auto &contentList = content.split(QLatin1Char(' '), QString::SkipEmptyParts); + QSet<QString> contentSet(contentList.cbegin(), contentList.cend()); // if the '#all' tag is defined, we return all allowed values if (contentSet.contains(QString::fromLatin1("#all"))) { diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp b/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp index 0708c1d..5602483 100644 --- a/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp +++ b/src/xmlpatterns/schema/qxsdschemaparsercontext.cpp @@ -81,7 +81,7 @@ QXmlName XsdSchemaParserContext::createAnonymousName(const QString &targetNamesp { m_anonymousNameCounter.ref(); - const QString name = QString::fromLatin1("__AnonymousClass_%1").arg(m_anonymousNameCounter.load()); + const QString name = QString::fromLatin1("__AnonymousClass_%1").arg(m_anonymousNameCounter.loadRelaxed()); return m_namePool->allocateQName(targetNamespace, name); } diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h index e535c8b..a82e29c 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h @@ -224,7 +224,7 @@ namespace QPatternist QSet<StateId> result = input; // add the input states to the list of to be processed states - QList<StateId> workStates = input.toList(); + QList<StateId> workStates = input.values(); while (!workStates.isEmpty()) { // while there are states to be processed left... // dequeue one state from list diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index 07a702b..62668c2 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -40,7 +40,7 @@ LoadingModel::LoadingModel(const Node::Vector &content, , m_nodes(content) { /* - foreach(const Node *n, content) + for (const Node *n : content) qDebug() << "this:" << n << "kind:" << n->kind << "parent: " << n->parent diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index b5b33c7..8d856be 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -330,7 +330,7 @@ void tst_QSourceLocation::setUri() const void tst_QSourceLocation::withinQVariant() const { QSourceLocation val; - const QVariant variant(qVariantFromValue(val)); + const auto variant = QVariant::fromValue(val); QSourceLocation val2(qvariant_cast<QSourceLocation>(variant)); } diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp index b1e9f07..7beb93a 100644 --- a/tests/auto/qxmlitem/tst_qxmlitem.cpp +++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp @@ -346,7 +346,7 @@ void tst_QXmlItem::constCorrectness() const void tst_QXmlItem::withinQVariant() const { QXmlItem val; - const QVariant variant(qVariantFromValue(val)); + const auto variant = QVariant::fromValue(val); QXmlItem val2(qvariant_cast<QXmlItem>(variant)); } diff --git a/tests/auto/qxmlname/tst_qxmlname.cpp b/tests/auto/qxmlname/tst_qxmlname.cpp index 7057137..9021af3 100644 --- a/tests/auto/qxmlname/tst_qxmlname.cpp +++ b/tests/auto/qxmlname/tst_qxmlname.cpp @@ -389,8 +389,7 @@ void tst_QXmlName::toClarkName_data() const */ void tst_QXmlName::withinQVariant() const { - /* The extra paranthesis silences a warning on win32-msvc2005. */ - QVariant value(qVariantFromValue(QXmlName())); + auto value = QVariant::fromValue(QXmlName()); } /*! @@ -398,9 +397,9 @@ void tst_QXmlName::withinQVariant() const */ void tst_QXmlName::typeWithinQVariant() const { - const int qxmlNameType = QVariant(qVariantFromValue(QXmlName())).userType(); + const int qxmlNameType = QVariant::fromValue(QXmlName()).userType(); - const QVariant value(qVariantFromValue(QXmlName())); + const auto value = QVariant::fromValue(QXmlName()); QCOMPARE(value.userType(), qxmlNameType); } diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index df4b955..09d3816 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -1215,9 +1215,9 @@ void tst_QXmlQuery::basicXQueryToQtTypeCheck() const expectedValues.append(QVariant(QByteArray::fromHex(QByteArray("FFFF")))); /* xs:hexBinary("FFFF"), */ expectedValues.append(QVariant(QString::fromLatin1("http://example.com/"))); /* xs:anyURI("http://example.com/"), */ QXmlNamePool np(query.namePool()); - expectedValues.append(QVariant(qVariantFromValue(QXmlName(np, QLatin1String("localName"), - QLatin1String("http://example.com/2"), - QLatin1String("prefix"))))); + expectedValues.append(QVariant::fromValue(QXmlName(np, QLatin1String("localName"), + QLatin1String("http://example.com/2"), + QLatin1String("prefix")))); expectedValues.append(QVariant(QString::fromLatin1("An xs:string"))); expectedValues.append(QVariant(QString::fromLatin1("normalizedString"))); |