diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-17 16:30:29 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-18 08:47:13 +0100 |
| commit | 159d7230d301f999633eecef25f8569f5e8831b6 (patch) | |
| tree | 4674dc1fd8349ca69f603ff2a0bc199f53a5ac07 | |
| parent | 09406d66659e03ae4769cde1c32f18f1388613d7 (diff) | |
| download | qtxmlpatterns-159d7230d301f999633eecef25f8569f5e8831b6.tar.gz | |
Fix deprecation warnings about QHash::unite()
Use QHash::insert() instead, fixing:
schema/qxsdparticlechecker.cpp:467:83: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated
schema/qxsdschemachecker.cpp:108:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated
schema/qxsdschemaresolver.cpp:267:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated
Change-Id: I5ac3ee4f9a8103a9ce1210d6c369597c6b0abddc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/xmlpatterns/schema/qxsdparticlechecker.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemachecker.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaresolver.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker.cpp b/src/xmlpatterns/schema/qxsdparticlechecker.cpp index 139390d..ad7cc8e 100644 --- a/src/xmlpatterns/schema/qxsdparticlechecker.cpp +++ b/src/xmlpatterns/schema/qxsdparticlechecker.cpp @@ -464,7 +464,7 @@ bool XsdParticleChecker::subsumes(const XsdParticle::Ptr &particle, const XsdPar } QHash<XsdTerm::Ptr, XsdParticle::Ptr> particlesHash = XsdStateMachineBuilder::particleLookupMap(particle); - particlesHash.unite(XsdStateMachineBuilder::particleLookupMap(derivedParticle)); + particlesHash.insert(XsdStateMachineBuilder::particleLookupMap(derivedParticle)); /* static int counter = 0; diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp index 91a796a..9f7c6a2 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker.cpp +++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp @@ -105,7 +105,7 @@ void XsdSchemaChecker::check() void XsdSchemaChecker::addComponentLocationHash(const ComponentLocationHash &hash) { - m_componentLocationHash.unite(hash); + m_componentLocationHash.insert(hash); } /** diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp index 1d21e31..7ca3808 100644 --- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp +++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp @@ -264,7 +264,7 @@ void XsdSchemaResolver::addSubstitutionGroupType(const XsdElement::Ptr &element) void XsdSchemaResolver::addComponentLocationHash(const ComponentLocationHash &hash) { - m_componentLocationHash.unite(hash); + m_componentLocationHash.insert(hash); } void XsdSchemaResolver::addEnumerationFacetValue(const AtomicValue::Ptr &facetValue, const NamespaceSupport &namespaceSupport) |