diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-11-27 15:09:12 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-11-27 21:45:07 +0000 |
| commit | 3738362b9072b7f5a3c31e5e2ba214646efeed84 (patch) | |
| tree | 09b99744049936facaba379e58a2e03124d2822a | |
| parent | 9ab300f9153b26df9b4dd3e9b92b875216cad83a (diff) | |
| download | qtxmlpatterns-3738362b9072b7f5a3c31e5e2ba214646efeed84.tar.gz | |
type: Add missing override and remove redundant virtual
Change-Id: I1c8c39947c9c6f54f6232d2a9cad5d5a41b4bd49
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
26 files changed, 697 insertions, 697 deletions
diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h index 80e1914..00abee9 100644 --- a/src/xmlpatterns/type/qabstractnodetest_p.h +++ b/src/xmlpatterns/type/qabstractnodetest_p.h @@ -67,9 +67,9 @@ namespace QPatternist public: AbstractNodeTest(const ItemType::Ptr &primaryType); - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; - virtual ItemType::Ptr xdtSuperType() const; - virtual ItemType::Ptr atomizedType() const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; + ItemType::Ptr xdtSuperType() const override; + ItemType::Ptr atomizedType() const override; protected: const ItemType::Ptr m_primaryType; diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h index cef414d..d2370ed 100644 --- a/src/xmlpatterns/type/qanyitemtype_p.h +++ b/src/xmlpatterns/type/qanyitemtype_p.h @@ -69,38 +69,38 @@ namespace QPatternist /** * @returns always "item()" */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @returns always @c true */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; /** * @returns always 0, item() is the super type in the * XPath Data Model hierarchy */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * @returns always @c false */ - virtual bool isNodeType() const; + bool isNodeType() const override; /** * @returns always @c false */ - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * @returns always @c true */ - virtual bool xdtTypeMatches(const ItemType::Ptr &type) const; + bool xdtTypeMatches(const ItemType::Ptr &type) const override; /** * @returns xs:anyAtomicType */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h index 86cd048..5ea1018 100644 --- a/src/xmlpatterns/type/qanynodetype_p.h +++ b/src/xmlpatterns/type/qanynodetype_p.h @@ -70,20 +70,20 @@ namespace QPatternist typedef QExplicitlySharedDataPointer<AnyNodeType> Ptr; - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; - virtual bool itemMatches(const Item &item) const; - virtual QString displayName(const NamePool::Ptr &np) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; + bool itemMatches(const Item &item) const override; + QString displayName(const NamePool::Ptr &np) const override; - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; - virtual bool isNodeType() const; - virtual bool isAtomicType() const; + bool isNodeType() const override; + bool isAtomicType() const override; /** * @see <a href="http://www.w3.org/TR/xpath-datamodel/#acc-summ-typed-value">XQuery 1.0 * and XPath 2.0 Data Model, G.15 dm:typed-value Accessor</a> */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; /** * @returns the node kind this node ItemType tests for. If it matches any node, zero is returned. diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h index 57a5320..1943d44 100644 --- a/src/xmlpatterns/type/qanysimpletype_p.h +++ b/src/xmlpatterns/type/qanysimpletype_p.h @@ -73,19 +73,19 @@ namespace QPatternist typedef QList<AnySimpleType::Ptr> List; friend class BuiltinTypes; - virtual ~AnySimpleType(); + ~AnySimpleType(); - virtual QXmlName name(const NamePool::Ptr &np) const; + QXmlName name(const NamePool::Ptr &np) const override; /** * @returns always @c xs:anySimpleType */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @returns always BuiltinTypes::xsAnyType */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * xs:anySimpleType is the special "simple ur-type". Therefore this function @@ -93,7 +93,7 @@ namespace QPatternist * * @returns SchemaType::None */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * The simple ur-type is a "special restriction of the ur-type definition", @@ -101,17 +101,17 @@ namespace QPatternist * * @returns DERIVATION_RESTRICTION */ - virtual SchemaType::DerivationMethod derivationMethod() const; + SchemaType::DerivationMethod derivationMethod() const override; /** * Always returns @c true. */ - virtual bool isSimpleType() const; + bool isSimpleType() const override; /** * Always returns @c false. */ - virtual bool isComplexType() const; + bool isComplexType() const override; protected: AnySimpleType(); diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h index 86b9a0d..859e8cf 100644 --- a/src/xmlpatterns/type/qanytype_p.h +++ b/src/xmlpatterns/type/qanytype_p.h @@ -71,31 +71,31 @@ namespace QPatternist typedef QExplicitlySharedDataPointer<AnyType> Ptr; friend class BuiltinTypes; - virtual ~AnyType(); + ~AnyType(); - virtual QXmlName name(const NamePool::Ptr &np) const; + QXmlName name(const NamePool::Ptr &np) const override; /** * @returns always "xs:anyType" */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @returns always @c false */ - virtual bool isAbstract() const; + bool isAbstract() const override; /** * @returns @c null, since <tt>xs:anyType</tt> has no base type, it is the ur-type. * * @returns always @c null */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * @returns @c true only if @p other is xsAnyType. */ - virtual bool wxsTypeMatches(const SchemaType::Ptr &other) const; + bool wxsTypeMatches(const SchemaType::Ptr &other) const override; /** * <tt>xs:anyType</tt> is the "ur-type" and special. Therefore, this function @@ -103,22 +103,22 @@ namespace QPatternist * * @returns SchemaType::None */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * @returns always NoDerivation. */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; /** * @returns an empty set of derivation constraint flags. */ - virtual DerivationConstraints derivationConstraints() const; + DerivationConstraints derivationConstraints() const override; /** * Always returns @c true. */ - virtual bool isComplexType() const; + bool isComplexType() const override; protected: /** diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h index c618164..f9b29b5 100644 --- a/src/xmlpatterns/type/qatomiccasterlocator_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h @@ -64,54 +64,54 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<AtomicCasterLocator> Ptr; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const reflection) const; + AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const reflection) const override; }; } diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h index 035d2bc..ea1ee15 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h @@ -70,54 +70,54 @@ namespace QPatternist AtomicComparatorLocator(); virtual ~AtomicComparatorLocator(); - virtual AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const) const override; }; } diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h index 1f7fcc6..c5a5d92 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h @@ -69,18 +69,18 @@ namespace QPatternist class DoubleComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -89,18 +89,18 @@ namespace QPatternist class FloatComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -109,18 +109,18 @@ namespace QPatternist class DecimalComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -129,18 +129,18 @@ namespace QPatternist class IntegerComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -149,9 +149,9 @@ namespace QPatternist class BooleanComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -160,9 +160,9 @@ namespace QPatternist class Base64BinaryComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -171,9 +171,9 @@ namespace QPatternist class HexBinaryComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -182,9 +182,9 @@ namespace QPatternist class QNameComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -193,15 +193,15 @@ namespace QPatternist class StringComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; @@ -211,9 +211,9 @@ namespace QPatternist class GYearComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -222,9 +222,9 @@ namespace QPatternist class GMonthComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -233,9 +233,9 @@ namespace QPatternist class GYearMonthComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -244,9 +244,9 @@ namespace QPatternist class GMonthDayComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -255,9 +255,9 @@ namespace QPatternist class GDayComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -266,9 +266,9 @@ namespace QPatternist class DateTimeComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -277,9 +277,9 @@ namespace QPatternist class SchemaTimeComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -288,9 +288,9 @@ namespace QPatternist class DateComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -299,15 +299,15 @@ namespace QPatternist class DurationComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -316,15 +316,15 @@ namespace QPatternist class DayTimeDurationComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; /** @@ -333,15 +333,15 @@ namespace QPatternist class YearMonthDurationComparatorLocator : public AtomicComparatorLocator { using AtomicComparatorLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const qint16 op, - const SourceLocationReflection *const) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const qint16 op, + const SourceLocationReflection *const) const override; }; } diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h index 56712b3..264c38f 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h @@ -72,78 +72,78 @@ namespace QPatternist virtual ~AtomicMathematicianLocator(); - virtual AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const qint16 op, - const SourceLocationReflection *const reflection) const; + AtomicTypeVisitorResult::Ptr visit(const AnyAtomicType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const qint16 op, + const SourceLocationReflection *const reflection) const override; }; } diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h index 50ad042..6ab2919 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h @@ -70,18 +70,18 @@ namespace QPatternist class DoubleMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -91,18 +91,18 @@ namespace QPatternist class FloatMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -112,18 +112,18 @@ namespace QPatternist class DecimalMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -133,18 +133,18 @@ namespace QPatternist class IntegerMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -154,12 +154,12 @@ namespace QPatternist class DateMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -169,10 +169,10 @@ namespace QPatternist class SchemaTimeMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -182,12 +182,12 @@ namespace QPatternist class DateTimeMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** * @author Frans Englich <frans.englich@nokia.com> @@ -196,22 +196,22 @@ namespace QPatternist class DayTimeDurationMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; /** @@ -221,20 +221,20 @@ namespace QPatternist class YearMonthDurationMathematicianLocator : public AtomicMathematicianLocator { using AtomicMathematicianLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, const qint16 op, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, const qint16 op, + const SourceLocationReflection *const r) const override; }; } diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h index 17c0b5d..9ad8cbf 100644 --- a/src/xmlpatterns/type/qatomictype_p.h +++ b/src/xmlpatterns/type/qatomictype_p.h @@ -88,23 +88,23 @@ namespace QPatternist * @returns @c true depending on if @p item is an atomic type, and that * AtomicValue::itemType()'s SequenceType::itemType() matches this type. */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; /** * @returns the result of SharedQXmlName::displayName(), of the SharedQName * object returned from the name() function. */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * returns always @c false */ - virtual bool isNodeType() const; + bool isNodeType() const override; /** * returns always @c true */ - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * Determines whether @p other is equal to this type, or is a @@ -113,22 +113,22 @@ namespace QPatternist * The implementation is generic, relying on operator==() * and xdtSuperType(). */ - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; /** * @returns always 'this' */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; /** * @returns always SchemaType::SimpleTypeAtomic */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * @returns DerivationRestriction */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; virtual AtomicTypeVisitorResult::Ptr accept(const QExplicitlySharedDataPointer<AtomicTypeVisitor> &visitor, diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h index 59db3c4..fa25f09 100644 --- a/src/xmlpatterns/type/qbasictypesfactory_p.h +++ b/src/xmlpatterns/type/qbasictypesfactory_p.h @@ -86,9 +86,9 @@ namespace QPatternist * @note This does not handle user defined types, only builtin types. * @todo Update documentation, proportionally with progress. */ - virtual SchemaType::Ptr createSchemaType(const QXmlName ) const; + SchemaType::Ptr createSchemaType(const QXmlName ) const override; - virtual SchemaType::Hash types() const; + SchemaType::Hash types() const override; /** * @returns the singleton instance of BasicTypesFactory. diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h index fa732fa..5bbd111 100644 --- a/src/xmlpatterns/type/qbuiltinatomictype_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h @@ -77,22 +77,22 @@ namespace QPatternist /** * @returns always @c false */ - virtual bool isAbstract() const; + bool isAbstract() const override; /** * @returns the base type as specified in the constructors baseType argument. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * @returns the same type as wxsSuperType(), except for the type @c xs:anyAtomicType, which * returns item() */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; - virtual AtomicComparatorLocator::Ptr comparatorLocator() const; - virtual AtomicMathematicianLocator::Ptr mathematicianLocator() const; - virtual AtomicCasterLocator::Ptr casterLocator() const; + AtomicComparatorLocator::Ptr comparatorLocator() const override; + AtomicMathematicianLocator::Ptr mathematicianLocator() const override; + AtomicCasterLocator::Ptr casterLocator() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h index 652a648..496e5ec 100644 --- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h @@ -70,34 +70,34 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<AnyAtomicType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; /** * Overridden to return <tt>item()</tt>. * * @returns BuiltinTypes::item */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * Overridden to return @c xs:anySimpleType. * * @returns BuiltinTypes::xsAnySimpleType */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * Overridden to return @c true, @c xs:anyAtomicType is abstract. * * @returns always @c true */ - virtual bool isAbstract() const; + bool isAbstract() const override; protected: friend class BuiltinTypes; @@ -115,13 +115,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<UntypedAtomicType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -139,14 +139,14 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DateTimeType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; DateTimeType(); @@ -163,13 +163,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DateType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -187,14 +187,14 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<SchemaTimeType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -212,13 +212,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DurationType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -236,13 +236,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<YearMonthDurationType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -260,13 +260,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DayTimeDurationType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -284,13 +284,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DoubleType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -308,13 +308,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<FloatType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: FloatType(); @@ -332,13 +332,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<DecimalType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -363,13 +363,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<IntegerType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -383,13 +383,13 @@ namespace QPatternist public: using IntegerType::accept; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &v, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &v, + const SourceLocationReflection *const r) const override { return v->visit(this, r); } - virtual QXmlName name(const NamePool::Ptr &np) const + QXmlName name(const NamePool::Ptr &np) const override { switch(derivedType) { @@ -411,7 +411,7 @@ namespace QPatternist return QXmlName(); } - virtual QString displayName(const NamePool::Ptr &np) const + QString displayName(const NamePool::Ptr &np) const override { return np->displayName(name(np)); } @@ -437,13 +437,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<GYearMonthType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -461,13 +461,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<GYearType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -485,13 +485,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<GMonthDayType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -509,13 +509,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<GDayType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -533,13 +533,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<GMonthType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -557,13 +557,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<BooleanType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -581,13 +581,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<Base64BinaryType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -605,13 +605,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<HexBinaryType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -629,13 +629,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<AnyURIType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -653,13 +653,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<QNameType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -685,13 +685,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<StringType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; protected: friend class BuiltinTypes; @@ -705,13 +705,13 @@ namespace QPatternist public: using StringType::accept; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &v, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &v, + const SourceLocationReflection *const r) const override { return v->visit(this, r); } - virtual QXmlName name(const NamePool::Ptr &np) const + QXmlName name(const NamePool::Ptr &np) const override { switch(derivedType) { @@ -731,7 +731,7 @@ namespace QPatternist return QXmlName(); } - virtual QString displayName(const NamePool::Ptr &np) const + QString displayName(const NamePool::Ptr &np) const override { return np->displayName(name(np)); } @@ -757,20 +757,20 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<NOTATIONType> Ptr; - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const reflection) const; - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const reflection) const; - virtual QXmlName name(const NamePool::Ptr &np) const; - virtual QString displayName(const NamePool::Ptr &np) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const reflection) const override; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const reflection) const override; + QXmlName name(const NamePool::Ptr &np) const override; + QString displayName(const NamePool::Ptr &np) const override; /** * Overridden to return @c true, xs:NOTATION is abstract. * * @returns always @c true */ - virtual bool isAbstract() const; + bool isAbstract() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h index 6ea4625..3602de9 100644 --- a/src/xmlpatterns/type/qbuiltinnodetype_p.h +++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h @@ -70,20 +70,20 @@ namespace QPatternist class BuiltinNodeType : public AnyNodeType { public: - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; - virtual bool itemMatches(const Item &item) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; + bool itemMatches(const Item &item) const override; /** * @returns for example "text()", depending on what the constructor was passed */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual ItemType::Ptr xdtSuperType() const; - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr xdtSuperType() const override; + ItemType::Ptr atomizedType() const override; - QXmlNodeModelIndex::NodeKind nodeKind() const; + QXmlNodeModelIndex::NodeKind nodeKind() const override; - PatternPriority patternPriority() const; + PatternPriority patternPriority() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h index 7940ba9..d81e334 100644 --- a/src/xmlpatterns/type/qebvtype_p.h +++ b/src/xmlpatterns/type/qebvtype_p.h @@ -78,10 +78,10 @@ namespace QPatternist /** * @todo docs if it's an ebvable type, etc. */ - virtual bool itemMatches(const Item &item) const; - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool itemMatches(const Item &item) const override; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @note The semantical meaning of this type's item type can @@ -90,7 +90,7 @@ namespace QPatternist * * @returns always 'this' since EBVType is also an ItemType */ - virtual ItemType::Ptr itemType() const; + ItemType::Ptr itemType() const override; /** * @note The semantical meaning of this type's cardinality @@ -99,24 +99,24 @@ namespace QPatternist * * @returns always Cardinality::zeroOrMore() */ - virtual Cardinality cardinality() const; + Cardinality cardinality() const override; - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * @returns always @c null */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; /** * @returns always BuiltinTypes::item */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * @returns always @c false */ - virtual bool isNodeType() const; + bool isNodeType() const override; protected: friend class CommonSequenceTypes; diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h index 6a18a4f..f4dbc31 100644 --- a/src/xmlpatterns/type/qemptysequencetype_p.h +++ b/src/xmlpatterns/type/qemptysequencetype_p.h @@ -75,37 +75,37 @@ namespace QPatternist * * @returns @c true if @p other is NoneType or EmptySequenceType, otherwise @c false. */ - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; /** * @returns always @c false */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; /** * @returns always "empty-sequence()" */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; - virtual bool isNodeType() const; - virtual bool isAtomicType() const; + bool isNodeType() const override; + bool isAtomicType() const override; /** * @return always Cardinality::empty() */ - virtual Cardinality cardinality() const; + Cardinality cardinality() const override; /** * @returns always 'this' since it is also an ItemType */ - virtual ItemType::Ptr itemType() const; + ItemType::Ptr itemType() const override; /** * @returns always @c xs:anyAtomicType */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; protected: friend class CommonSequenceTypes; diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h index e13de3a..05f036a 100644 --- a/src/xmlpatterns/type/qgenericsequencetype_p.h +++ b/src/xmlpatterns/type/qgenericsequencetype_p.h @@ -73,11 +73,11 @@ namespace QPatternist * prefix used for the QName identifying the schema type is conventional. * An example of a display name for a GenericSequenceType is "xs:integer?". */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual Cardinality cardinality() const; + Cardinality cardinality() const override; - virtual ItemType::Ptr itemType() const; + ItemType::Ptr itemType() const override; private: const ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h index 7e46b88..eab08f0 100644 --- a/src/xmlpatterns/type/qlocalnametest_p.h +++ b/src/xmlpatterns/type/qlocalnametest_p.h @@ -74,15 +74,15 @@ namespace QPatternist /** * @note This function assumes that @p item is a QXmlNodeModelIndex. */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual bool operator==(const ItemType &other) const; - virtual PatternPriority patternPriority() const; + bool operator==(const ItemType &other) const override; + PatternPriority patternPriority() const override; protected: - virtual InstanceOf instanceOf() const; + InstanceOf instanceOf() const override; private: LocalNameTest(const ItemType::Ptr &primaryType, const QXmlName::LocalNameCode &ncName); diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h index 4f301bd..88d3fd0 100644 --- a/src/xmlpatterns/type/qmultiitemtype_p.h +++ b/src/xmlpatterns/type/qmultiitemtype_p.h @@ -86,7 +86,7 @@ namespace QPatternist * and <tt>xs:anyAtomicType</tt>, the display name is * "document() | xs:integer | xs:anyAtomicType". */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * If any of the types this MultiItemType represents matches @p item, it is @@ -94,7 +94,7 @@ namespace QPatternist * * @returns @c true if any of the housed ItemType instances matches @p item, otherwise @c false */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; /** * If any of the types this MultiItemType represents matches @p other, it is @@ -102,24 +102,24 @@ namespace QPatternist * * @returns @c true if any of the housed ItemType instances matches @p other, otherwise @c false */ - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; /** * @returns @c true if any of the represented types is a node type. */ - virtual bool isNodeType() const; + bool isNodeType() const override; /** * @returns @c true if any of the represented types is an atomic type. */ - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * Determines the union type of all the represented types super types. For example, * if the represented types are <tt>xs:integer</tt>, <tt>document()</tt> * and <tt>xs:string</tt>, <tt>item()</tt> is returned. */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * Determines the union type of all the represented types atomized types. For example, @@ -127,7 +127,7 @@ namespace QPatternist * <tt>xs:anyAtomicType</tt> is returned, because that's the super type of <tt>xs:integer</tt> * and <tt>xs:untypedAtomic</tt>. */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; private: const ItemType::List m_types; diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h index d0ad628..25819b7 100644 --- a/src/xmlpatterns/type/qnamespacenametest_p.h +++ b/src/xmlpatterns/type/qnamespacenametest_p.h @@ -74,15 +74,15 @@ namespace QPatternist /** * @note This function assumes that @p item is a QXmlNodeModelIndex. */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual bool operator==(const ItemType &other) const; - PatternPriority patternPriority() const; + bool operator==(const ItemType &other) const override; + PatternPriority patternPriority() const override; protected: - virtual InstanceOf instanceOf() const; + InstanceOf instanceOf() const override; private: NamespaceNameTest(const ItemType::Ptr &primaryType, const QXmlName::NamespaceCode namespaceURI); diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h index 11f25e1..a301cbc 100644 --- a/src/xmlpatterns/type/qnonetype_p.h +++ b/src/xmlpatterns/type/qnonetype_p.h @@ -74,13 +74,13 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<NoneType> Ptr; - virtual bool itemMatches(const Item &item) const; - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool itemMatches(const Item &item) const override; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; /** * @returns always "none". That is, no namespace prefix */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @note The semantical meaning of this type's item type can @@ -89,7 +89,7 @@ namespace QPatternist * * @returns always 'this' since NoneType is also an ItemType */ - virtual ItemType::Ptr itemType() const; + ItemType::Ptr itemType() const override; /** * @note The semantical meaning of this type's cardinality @@ -98,12 +98,12 @@ namespace QPatternist * * @returns always Cardinality::zeroOrMore() */ - virtual Cardinality cardinality() const; + Cardinality cardinality() const override; /** * @returns always @c false */ - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * This can be thought to be a weird function for this type(none). There @@ -118,24 +118,24 @@ namespace QPatternist * static operator lookup is postponed to runtime. Subsequently, expressions like error() * works properly with other XPath expressions. */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; /** * @returns always @c false */ - virtual bool isNodeType() const; + bool isNodeType() const override; /** * @returns always item() */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * @returns always @p other. The none type can be thought as * disappearing when attempting to find the union of it and * another type. */ - virtual const ItemType &operator|(const ItemType &other) const; + const ItemType &operator|(const ItemType &other) const override; protected: diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h index 530e924..99f311b 100644 --- a/src/xmlpatterns/type/qnumerictype_p.h +++ b/src/xmlpatterns/type/qnumerictype_p.h @@ -69,43 +69,43 @@ namespace QPatternist public: virtual ~NumericType(); - virtual bool itemMatches(const Item &item) const; - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; + bool itemMatches(const Item &item) const override; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; /** * @returns always "numeric". That is, no namespace prefix */ - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; /** * @returns always @c true */ - virtual bool isAbstract() const; + bool isAbstract() const override; /** * @returns always @c false */ - virtual bool isNodeType() const; + bool isNodeType() const override; /** * @returns always @c true */ - virtual bool isAtomicType() const; + bool isAtomicType() const override; /** * @returns always xs:anyAtomicType */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * @returns always xs:anyAtomicType */ - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; /** * @returns @c null. It makes no sense to atomize the abstract type @c fs:numeric. */ - virtual ItemType::Ptr atomizedType() const; + ItemType::Ptr atomizedType() const override; /** * NumericType cannot be visited. This function is only implemented @@ -113,8 +113,8 @@ namespace QPatternist * * @returns always a @c null pointer */ - virtual AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr accept(const AtomicTypeVisitor::Ptr &visitor, + const SourceLocationReflection *const) const override; /** * NumericType cannot be visited. This function is only implemented @@ -122,9 +122,9 @@ namespace QPatternist * * @returns always a @c null pointer */ - virtual AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, - const qint16 op, - const SourceLocationReflection *const) const; + AtomicTypeVisitorResult::Ptr accept(const ParameterizedAtomicTypeVisitor::Ptr &visitor, + const qint16 op, + const SourceLocationReflection *const) const override; /** * The type @c fs:numeric is an abstract type which therefore @@ -134,7 +134,7 @@ namespace QPatternist * * @returns always a @c null pointer */ - virtual AtomicComparatorLocator::Ptr comparatorLocator() const; + AtomicComparatorLocator::Ptr comparatorLocator() const override; /** * The type @c fs:numeric is an abstract type which therefore @@ -144,7 +144,7 @@ namespace QPatternist * * @returns always a @c null pointer */ - virtual AtomicMathematicianLocator::Ptr mathematicianLocator() const; + AtomicMathematicianLocator::Ptr mathematicianLocator() const override; /** @@ -155,7 +155,7 @@ namespace QPatternist * * @returns always a @c null pointer */ - virtual AtomicCasterLocator::Ptr casterLocator() const; + AtomicCasterLocator::Ptr casterLocator() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h index 451d2ec..57547e4 100644 --- a/src/xmlpatterns/type/qqnametest_p.h +++ b/src/xmlpatterns/type/qqnametest_p.h @@ -74,16 +74,16 @@ namespace QPatternist /** * @note This function assumes that @p item is a QXmlNodeModelIndex. */ - virtual bool itemMatches(const Item &item) const; + bool itemMatches(const Item &item) const override; - virtual QString displayName(const NamePool::Ptr &np) const; + QString displayName(const NamePool::Ptr &np) const override; - virtual bool operator==(const ItemType &other) const; + bool operator==(const ItemType &other) const override; - virtual PatternPriority patternPriority() const; + PatternPriority patternPriority() const override; protected: - virtual InstanceOf instanceOf() const; + InstanceOf instanceOf() const override; private: QNameTest(const ItemType::Ptr &primaryType, const QXmlName qName); diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h index 7df2876..e48bc1e 100644 --- a/src/xmlpatterns/type/quntyped_p.h +++ b/src/xmlpatterns/type/quntyped_p.h @@ -75,9 +75,9 @@ namespace QPatternist /** * @returns always BuiltinTypes::xsAnyType. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; - virtual QXmlName name(const NamePool::Ptr &np) const; + QXmlName name(const NamePool::Ptr &np) const override; /** * @returns always <tt>xs:untypedAtomic</tt> @@ -87,12 +87,12 @@ namespace QPatternist /** * @returns always SchemaType::ComplexType */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * @returns always NoDerivation */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; protected: friend class BuiltinTypes; diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h index 2881778..03e69dc 100644 --- a/src/xmlpatterns/type/qxsltnodetest_p.h +++ b/src/xmlpatterns/type/qxsltnodetest_p.h @@ -71,10 +71,10 @@ namespace QPatternist class XSLTNodeTest : public AnyNodeType { public: - virtual bool xdtTypeMatches(const ItemType::Ptr &other) const; - virtual bool itemMatches(const Item &item) const; + bool xdtTypeMatches(const ItemType::Ptr &other) const override; + bool itemMatches(const Item &item) const override; - virtual ItemType::Ptr xdtSuperType() const; + ItemType::Ptr xdtSuperType() const override; protected: friend class BuiltinTypes; |