From 4c155d94a294ace4a402f135272f04bcd73f4732 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Nov 2019 13:48:15 +0100 Subject: Avoid initializing QFlags with 0 or nullptr It is being deprecated. Change-Id: I3c331ceb434f48939e4ce7e550c57df1b1794b17 Reviewed-by: Allan Sandfeld Jensen --- src/xmlpatterns/schema/qxsdschemahelper.cpp | 2 +- src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xmlpatterns/schema/qxsdschemahelper.cpp b/src/xmlpatterns/schema/qxsdschemahelper.cpp index cdaa1c2..843e7c5 100644 --- a/src/xmlpatterns/schema/qxsdschemahelper.cpp +++ b/src/xmlpatterns/schema/qxsdschemahelper.cpp @@ -388,7 +388,7 @@ XsdWildcard::Ptr XsdSchemaHelper::wildcardIntersection(const XsdWildcard::Ptr &w static SchemaType::DerivationConstraints convertBlockingConstraints(const NamedSchemaComponent::BlockingConstraints &constraints) { - SchemaType::DerivationConstraints result = 0; + SchemaType::DerivationConstraints result; if (constraints & NamedSchemaComponent::RestrictionConstraint) result |= SchemaType::RestrictionConstraint; diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp index 7e60667..7661569 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp @@ -489,7 +489,7 @@ bool XsdValidatingInstanceReader::validateElement(const XsdElement::Ptr &declara } // 4.2 - SchemaType::DerivationConstraints constraints = 0; + SchemaType::DerivationConstraints constraints; if (declaration->disallowedSubstitutions() & NamedSchemaComponent::ExtensionConstraint) constraints |= SchemaType::ExtensionConstraint; if (declaration->disallowedSubstitutions() & NamedSchemaComponent::RestrictionConstraint) -- cgit v1.2.1