diff options
152 files changed, 997 insertions, 1001 deletions
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h index 593e4001..80ff60cd 100644 --- a/src/xmlpatterns/data/qabstractfloat_p.h +++ b/src/xmlpatterns/data/qabstractfloat_p.h @@ -92,7 +92,7 @@ namespace QPatternist * * @returns @c false if the number is 0 or @c NaN, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; /** * Returns this AbstractFloat represented as an @c xs:string. @@ -105,27 +105,27 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#casting-to-string">XQuery 1.0 * and XPath 2.0 Functions and Operators, 17.1.2 Casting to xs:string and xdt:untypedAtomic</a> */ - virtual QString stringValue() const; + QString stringValue() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; - virtual bool isNaN() const; - virtual bool isInf() const; + bool isNaN() const override; + bool isInf() const override; - virtual ItemType::Ptr type() const; - virtual Item toNegated() const; - virtual qulonglong toUnsignedInteger() const; + ItemType::Ptr type() const override; + Item toNegated() const override; + qulonglong toUnsignedInteger() const override; - virtual bool isSigned() const; + bool isSigned() const override; protected: AbstractFloat(const xsDouble num); diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h index 84ffca63..917f0f28 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters_p.h +++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h @@ -77,8 +77,8 @@ namespace QPatternist class NumericToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -91,8 +91,8 @@ namespace QPatternist class StringToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -105,8 +105,8 @@ namespace QPatternist class BooleanToAbstractFloatCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; #include "qabstractfloatcasters_tpl_p.h" diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h index 395337d0..71333353 100644 --- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h +++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h @@ -76,10 +76,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; #include "qabstractfloatmathematician_tpl_p.h" diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h index 2d290fee..aa0ac452 100644 --- a/src/xmlpatterns/data/qanyuri_p.h +++ b/src/xmlpatterns/data/qanyuri_p.h @@ -175,7 +175,7 @@ namespace QPatternist static AnyURI::Ptr resolveURI(const QString &relative, const QString &base); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; /** * @short Returns this @c xs:anyURI value in a QUrl. diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h index ae0f2fc6..59448bae 100644 --- a/src/xmlpatterns/data/qatomiccasters_p.h +++ b/src/xmlpatterns/data/qatomiccasters_p.h @@ -82,8 +82,8 @@ namespace QPatternist class ToStringCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { Q_ASSERT(from); return DerivedString<DerivedType>::fromLexical(context->namePool(), from.stringValue()); @@ -103,8 +103,8 @@ namespace QPatternist class ToUntypedAtomicCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -116,8 +116,8 @@ namespace QPatternist class ToAnyURICaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -129,8 +129,8 @@ namespace QPatternist class HexBinaryToBase64BinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -142,8 +142,8 @@ namespace QPatternist class Base64BinaryToHexBinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -155,8 +155,8 @@ namespace QPatternist class StringToBase64BinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -168,8 +168,8 @@ namespace QPatternist class StringToHexBinaryCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -181,8 +181,8 @@ namespace QPatternist class NumericToBooleanCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -194,8 +194,8 @@ namespace QPatternist class StringToBooleanCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -219,8 +219,8 @@ namespace QPatternist return QtXmlPatterns::tr("When casting to %1 from %2, the source value cannot be %3."); } - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { const ItemType::Ptr t(from.type()); const Numeric *const num = from.template as<Numeric>(); @@ -253,8 +253,8 @@ namespace QPatternist class StringToDecimalCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -266,8 +266,8 @@ namespace QPatternist class StringToIntegerCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -279,8 +279,8 @@ namespace QPatternist class BooleanToDecimalCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -292,8 +292,8 @@ namespace QPatternist class BooleanToIntegerCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -315,8 +315,8 @@ namespace QPatternist /** * This function simply returns @p from. */ - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -328,8 +328,8 @@ namespace QPatternist class StringToGYearCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -341,8 +341,8 @@ namespace QPatternist class StringToGDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -354,8 +354,8 @@ namespace QPatternist class StringToGMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -367,8 +367,8 @@ namespace QPatternist class StringToGYearMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -380,8 +380,8 @@ namespace QPatternist class StringToGMonthDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -393,8 +393,8 @@ namespace QPatternist class StringToDateTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -406,8 +406,8 @@ namespace QPatternist class StringToTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -419,8 +419,8 @@ namespace QPatternist class StringToDateCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -432,8 +432,8 @@ namespace QPatternist class StringToDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -445,8 +445,8 @@ namespace QPatternist class StringToDayTimeDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -458,8 +458,8 @@ namespace QPatternist class StringToYearMonthDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; @@ -472,8 +472,8 @@ namespace QPatternist class AbstractDateTimeToGYearCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -485,8 +485,8 @@ namespace QPatternist class AbstractDateTimeToGYearMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -498,8 +498,8 @@ namespace QPatternist class AbstractDateTimeToGMonthCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -511,8 +511,8 @@ namespace QPatternist class AbstractDateTimeToGMonthDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -524,8 +524,8 @@ namespace QPatternist class AbstractDateTimeToGDayCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -537,8 +537,8 @@ namespace QPatternist class AbstractDateTimeToDateTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -550,8 +550,8 @@ namespace QPatternist class AbstractDateTimeToDateCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -563,8 +563,8 @@ namespace QPatternist class AbstractDateTimeToTimeCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -576,8 +576,8 @@ namespace QPatternist class AbstractDurationToDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -589,8 +589,8 @@ namespace QPatternist class AbstractDurationToDayTimeDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -602,8 +602,8 @@ namespace QPatternist class AbstractDurationToYearMonthDurationCaster : public AtomicCaster { public: - virtual Item castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -616,9 +616,8 @@ namespace QPatternist class StringToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedInteger<type>::fromLexical(context->namePool(), from.stringValue()); } @@ -634,9 +633,8 @@ namespace QPatternist class BooleanToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedInteger<type>::fromValue(context->namePool(), from.template as<AtomicValue>()->evaluateEBV(context) ? 1 : 0); } @@ -652,9 +650,8 @@ namespace QPatternist class AnyToDerivedStringCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { return DerivedString<type>::fromLexical(context->namePool(), from.stringValue()); } @@ -670,9 +667,8 @@ namespace QPatternist class NumericToDerivedIntegerCaster : public AtomicCaster { public: - virtual Item - castFrom(const Item &from, - const QExplicitlySharedDataPointer<DynamicContext> &context) const + Item castFrom(const Item &from, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override { const ItemType::Ptr t(from.type()); const Numeric *const num = from.template as<Numeric>(); diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h index b46d06bc..4f23e2ea 100644 --- a/src/xmlpatterns/data/qatomiccomparators_p.h +++ b/src/xmlpatterns/data/qatomiccomparators_p.h @@ -82,9 +82,9 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#string-compare">XQuery 1.0 and XPath * 2.0 Functions and Operators, 7.3 ValueComparison::Equality and Comparison of Strings</a> */ - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; /** * Compares two strings, and returns @c true if they are considered equal as per @@ -94,8 +94,8 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath-functions/#string-compare">XQuery 1.0 and XPath * 2.0 Functions and Operators, 7.3 ValueComparison::Equality and Comparison of Strings</a> */ - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -111,15 +111,15 @@ namespace QPatternist /** * Converts both string values to upper case and afterwards compare them. */ - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; /** * Converts both string values case insensitively. */ - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -130,8 +130,8 @@ namespace QPatternist class BinaryDataComparator : public AtomicComparator { public: - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -144,12 +144,12 @@ namespace QPatternist class BooleanComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -162,12 +162,12 @@ namespace QPatternist class AbstractFloatComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -181,9 +181,9 @@ namespace QPatternist class AbstractFloatSortComparator : public AbstractFloatComparator { public: - virtual ComparisonResult compare(const Item &o1, - const AtomicComparator::Operator op, - const Item &o2) const + ComparisonResult compare(const Item &o1, + const AtomicComparator::Operator op, + const Item &o2) const override { Q_ASSERT_X(t_op == OperatorLessThanNaNLeast || t_op == OperatorLessThanNaNGreatest, Q_FUNC_INFO, "Can only be instantiated with those two."); @@ -216,12 +216,12 @@ namespace QPatternist class DecimalComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -232,12 +232,12 @@ namespace QPatternist class IntegerComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -248,8 +248,8 @@ namespace QPatternist class QNameComparator : public AtomicComparator { public: - virtual bool equals(const Item &op1, - const Item &op2) const; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -260,11 +260,11 @@ namespace QPatternist class AbstractDateTimeComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; - virtual bool equals(const Item &op1, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; + bool equals(const Item &op1, + const Item &op2) const override; }; /** @@ -275,11 +275,11 @@ namespace QPatternist class AbstractDurationComparator : public AtomicComparator { public: - virtual ComparisonResult compare(const Item &op1, - const AtomicComparator::Operator op, - const Item &op2) const; - virtual bool equals(const Item &op1, - const Item &op2) const; + ComparisonResult compare(const Item &op1, + const AtomicComparator::Operator op, + const Item &op2) const override; + bool equals(const Item &op1, + const Item &op2) const override; private: static inline QDateTime addDurationToDateTime(const QDateTime &dateTime, diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h index c8831ead..c8f86651 100644 --- a/src/xmlpatterns/data/qatomicmathematicians_p.h +++ b/src/xmlpatterns/data/qatomicmathematicians_p.h @@ -76,10 +76,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -96,10 +96,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -117,10 +117,10 @@ namespace QPatternist { } - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -133,10 +133,10 @@ namespace QPatternist class DurationDurationDivisor : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -149,10 +149,10 @@ namespace QPatternist class DurationDurationMathematician : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -188,10 +188,10 @@ namespace QPatternist * Switch @p o1 and @p o2, and returns the value from the AtomicMathematician * this OperandSwitcherMathematician represents. */ - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; private: const AtomicMathematician::Ptr m_mather; }; @@ -216,10 +216,10 @@ namespace QPatternist * @p o1 is an AbstractDateTime and @p o2 is an AbstractDuration. * */ - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; /** @@ -231,10 +231,10 @@ namespace QPatternist class AbstractDateTimeMathematician : public AtomicMathematician { public: - virtual Item calculate(const Item &o1, - const Operator op, - const Item &o2, - const QExplicitlySharedDataPointer<DynamicContext> &context) const; + Item calculate(const Item &o1, + const Operator op, + const Item &o2, + const QExplicitlySharedDataPointer<DynamicContext> &context) const override; }; } diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h index 82368db8..1a16d122 100644 --- a/src/xmlpatterns/data/qatomicstring_p.h +++ b/src/xmlpatterns/data/qatomicstring_p.h @@ -95,14 +95,14 @@ namespace QPatternist * * @returns @c false if the contained string has a zero-length, otherwise @c true. */ - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; /** * The string value of a AtomicString instance is the value space. */ - virtual QString stringValue() const; + QString stringValue() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; protected: friend class StringComparator; diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h index 38db3b11..67ef9829 100644 --- a/src/xmlpatterns/data/qbase64binary_p.h +++ b/src/xmlpatterns/data/qbase64binary_p.h @@ -77,8 +77,8 @@ namespace QPatternist static Base64Binary::Ptr fromValue(const QByteArray &data); - virtual QString stringValue() const; - virtual ItemType::Ptr type() const; + QString stringValue() const override; + ItemType::Ptr type() const override; inline const QByteArray &asByteArray() const { return m_value; diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h index 1bcd0754..0aa17665 100644 --- a/src/xmlpatterns/data/qboolean_p.h +++ b/src/xmlpatterns/data/qboolean_p.h @@ -80,7 +80,7 @@ namespace QPatternist static bool evaluateEBV(const Item &item, const QExplicitlySharedDataPointer<DynamicContext> &context); - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns a Boolean object instantiating @p value. Use True() or False() @@ -98,9 +98,9 @@ namespace QPatternist * Get the Effective %Boolean Value of this boolean value. For <tt>xs:boolean</tt>, this * is simply the value. */ - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline bool value() const { diff --git a/src/xmlpatterns/data/qcomparisonfactory.cpp b/src/xmlpatterns/data/qcomparisonfactory.cpp index 793f7247..13aefd54 100644 --- a/src/xmlpatterns/data/qcomparisonfactory.cpp +++ b/src/xmlpatterns/data/qcomparisonfactory.cpp @@ -95,7 +95,7 @@ public: return flexibleCompare(operand1, operand2, context); } - const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_sourceReflection; } diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h index 1796f676..1ace503c 100644 --- a/src/xmlpatterns/data/qdate_p.h +++ b/src/xmlpatterns/data/qdate_p.h @@ -73,9 +73,9 @@ namespace QPatternist static Date::Ptr fromLexical(const QString &string); static Date::Ptr fromDateTime(const QDateTime &date); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h index 9c5334f2..4b08c193 100644 --- a/src/xmlpatterns/data/qdaytimeduration_p.h +++ b/src/xmlpatterns/data/qdaytimeduration_p.h @@ -89,23 +89,23 @@ namespace QPatternist static DayTimeDuration::Ptr fromSeconds(const SecondCountProperty secs, const MSecondProperty msecs = 0); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * @returns always 0. */ - virtual YearProperty years() const; + YearProperty years() const override; /** * @returns always 0. */ - virtual MonthProperty months() const; - virtual DayCountProperty days() const; - virtual HourProperty hours() const; - virtual MinuteProperty minutes() const; - virtual MSecondProperty mseconds() const; - virtual SecondProperty seconds() const; + MonthProperty months() const override; + DayCountProperty days() const override; + HourProperty hours() const override; + MinuteProperty minutes() const override; + MSecondProperty mseconds() const override; + SecondProperty seconds() const override; /** * @returns the value of this xs:dayTimeDuration @@ -114,7 +114,7 @@ namespace QPatternist * and XPath 2.0 Functions and Operators, 10.3.2.2 Calculating the value of a * xs:dayTimeDuration from the lexical representation</a> */ - virtual Value value() const; + Value value() const override; /** * Creates a DayTimeDuration containing the value @p val. @p val is @@ -122,7 +122,7 @@ namespace QPatternist * * If @p val is zero, is CommonValues::DayTimeDurationZero returned. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h index 68fa573e..4cd7c289 100644 --- a/src/xmlpatterns/data/qdecimal_p.h +++ b/src/xmlpatterns/data/qdecimal_p.h @@ -87,40 +87,40 @@ namespace QPatternist * * @returns @c false if the number is 0 or @c NaN, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns always BuiltinTypes::xsDecimal */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; - virtual qulonglong toUnsignedInteger() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; + qulonglong toUnsignedInteger() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; /** * @returns always @c false, xs:decimal doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const; + bool isNaN() const override; /** * @returns always @c false, xs:decimal doesn't have * infinity in its value space. */ - virtual bool isInf() const; + bool isInf() const override; - virtual Item toNegated() const; + Item toNegated() const override; /** * Converts @p value into a canonical string representation for @c xs:decimal. This @@ -129,7 +129,7 @@ namespace QPatternist */ static QString toString(const xsDecimal value); - virtual bool isSigned() const; + bool isSigned() const override; protected: diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index bd700fc8..6fe0290b 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -472,63 +472,63 @@ namespace QPatternist * * @returns @c false if the number is 0, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override { return m_value != 0; } - virtual QString stringValue() const + QString stringValue() const override { return QString::number(m_value); } - virtual ItemType::Ptr type() const + ItemType::Ptr type() const override { return itemType(); } - virtual xsDouble toDouble() const + xsDouble toDouble() const override { return static_cast<xsDouble>(m_value); } - virtual xsInteger toInteger() const + xsInteger toInteger() const override { return m_value; } - virtual xsFloat toFloat() const + xsFloat toFloat() const override { return static_cast<xsFloat>(m_value); } - virtual xsDecimal toDecimal() const + xsDecimal toDecimal() const override { return static_cast<xsDecimal>(m_value); } - virtual Numeric::Ptr round() const + Numeric::Ptr round() const override { /* xs:integerS never have a mantissa. */ return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr roundHalfToEven(const xsInteger) const + Numeric::Ptr roundHalfToEven(const xsInteger) const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr floor() const + Numeric::Ptr floor() const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr ceiling() const + Numeric::Ptr ceiling() const override { return Numeric::Ptr(static_cast<Numeric *>(const_cast<AtomicValue *>(Integer::fromValue(m_value).asAtomicValue()))); } - virtual Numeric::Ptr abs() const + Numeric::Ptr abs() const override { /* We unconditionally create an Integer even if we're a positive * value, because one part of this is the type change to @@ -544,7 +544,7 @@ namespace QPatternist * @returns always @c false, @c xs:DerivedInteger doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const + bool isNaN() const override { return false; } @@ -553,17 +553,17 @@ namespace QPatternist * @returns always @c false, @c xs:DerivedInteger doesn't have * infinity in its value space. */ - virtual bool isInf() const + bool isInf() const override { return false; } - virtual Item toNegated() const + Item toNegated() const override { return Integer::fromValue(-xsInteger(m_value)); } - virtual bool isSigned() const + bool isSigned() const override { switch(DerivedType) { @@ -587,7 +587,7 @@ namespace QPatternist return false; } - virtual qulonglong toUnsignedInteger() const + qulonglong toUnsignedInteger() const override { switch(DerivedType) { diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h index b37e77e3..dea83d2e 100644 --- a/src/xmlpatterns/data/qderivedstring_p.h +++ b/src/xmlpatterns/data/qderivedstring_p.h @@ -310,17 +310,17 @@ namespace QPatternist } } - virtual QString stringValue() const + QString stringValue() const override { return m_value; } - virtual bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override { return m_value.length() > 0; } - virtual ItemType::Ptr type() const + ItemType::Ptr type() const override { return itemType(); } diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h index 975aa436..e88da413 100644 --- a/src/xmlpatterns/data/qduration_p.h +++ b/src/xmlpatterns/data/qduration_p.h @@ -80,28 +80,28 @@ namespace QPatternist const SecondProperty seconds, const MSecondProperty mseconds); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * Always results in an assert crash. Calling this function makes no * sense due to that the value space of xs:duration is not well defined. */ - virtual Value value() const; + Value value() const override; /** * Always results in an assert crash. Calling this function makes no * sense due to that the value space of xs:duration is not well defined. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; - virtual YearProperty years() const; - virtual MonthProperty months() const; - virtual DayCountProperty days() const; - virtual HourProperty hours() const; - virtual MinuteProperty minutes() const; - virtual SecondProperty seconds() const; - virtual MSecondProperty mseconds() const; + YearProperty years() const override; + MonthProperty months() const override; + DayCountProperty days() const override; + HourProperty hours() const override; + MinuteProperty minutes() const override; + SecondProperty seconds() const override; + MSecondProperty mseconds() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h index 60b327fe..ef5f0b68 100644 --- a/src/xmlpatterns/data/qgday_p.h +++ b/src/xmlpatterns/data/qgday_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GDay::Ptr fromLexical(const QString &string); static GDay::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h index 6f8686f7..49b4c353 100644 --- a/src/xmlpatterns/data/qgmonth_p.h +++ b/src/xmlpatterns/data/qgmonth_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GMonth::Ptr fromLexical(const QString &string); static GMonth::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h index a9d8891e..5d9e1985 100644 --- a/src/xmlpatterns/data/qgmonthday_p.h +++ b/src/xmlpatterns/data/qgmonthday_p.h @@ -73,9 +73,9 @@ namespace QPatternist static GMonthDay::Ptr fromLexical(const QString &string); static GMonthDay::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual QString stringValue() const; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h index 6d3b5a2f..bf0e9cb2 100644 --- a/src/xmlpatterns/data/qgyear_p.h +++ b/src/xmlpatterns/data/qgyear_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GYear::Ptr fromLexical(const QString &string); static GYear::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h index 896cf9b2..167a6b6b 100644 --- a/src/xmlpatterns/data/qgyearmonth_p.h +++ b/src/xmlpatterns/data/qgyearmonth_p.h @@ -73,8 +73,8 @@ namespace QPatternist static GYearMonth::Ptr fromLexical(const QString &string); static GYearMonth::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h index e10845a1..6583de32 100644 --- a/src/xmlpatterns/data/qhexbinary_p.h +++ b/src/xmlpatterns/data/qhexbinary_p.h @@ -74,8 +74,8 @@ namespace QPatternist typedef AtomicValue::Ptr Ptr; - virtual QString stringValue() const; - virtual ItemType::Ptr type() const; + QString stringValue() const override; + ItemType::Ptr type() const override; /** * Creates a @c xs:hexBinary from the lexical representation @p value. diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h index 4f4dbe5d..50cc9aa2 100644 --- a/src/xmlpatterns/data/qinteger_p.h +++ b/src/xmlpatterns/data/qinteger_p.h @@ -84,44 +84,44 @@ namespace QPatternist * * @returns @c false if the number is 0, otherwise @c true. */ - bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const; + bool evaluateEBV(const QExplicitlySharedDataPointer<DynamicContext> &) const override; - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns always BuiltinTypes::xsInteger */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; - virtual xsDouble toDouble() const; - virtual xsInteger toInteger() const; - virtual xsFloat toFloat() const; - virtual xsDecimal toDecimal() const; + xsDouble toDouble() const override; + xsInteger toInteger() const override; + xsFloat toFloat() const override; + xsDecimal toDecimal() const override; - virtual Numeric::Ptr round() const; - virtual Numeric::Ptr roundHalfToEven(const xsInteger scale) const; - virtual Numeric::Ptr floor() const; - virtual Numeric::Ptr ceiling() const; - virtual Numeric::Ptr abs() const; - virtual qulonglong toUnsignedInteger() const; + Numeric::Ptr round() const override; + Numeric::Ptr roundHalfToEven(const xsInteger scale) const override; + Numeric::Ptr floor() const override; + Numeric::Ptr ceiling() const override; + Numeric::Ptr abs() const override; + qulonglong toUnsignedInteger() const override; /** * @returns always @c false, @c xs:integer doesn't have * not-a-number in its value space. */ - virtual bool isNaN() const; + bool isNaN() const override; /** * @returns always @c false, @c xs:integer doesn't have * infinity in its value space. */ - virtual bool isInf() const; - virtual Item toNegated() const; + bool isInf() const override; + Item toNegated() const override; /** * @short Returns always @c true. */ - virtual bool isSigned() const; + bool isSigned() const override; protected: Integer(const xsInteger num); diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h index a14dd875..0aa349f0 100644 --- a/src/xmlpatterns/data/qqnamevalue_p.h +++ b/src/xmlpatterns/data/qqnamevalue_p.h @@ -85,9 +85,9 @@ namespace QPatternist */ static QNameValue::Ptr fromValue(const NamePool::Ptr &np, const QXmlName name); - virtual QString stringValue() const; + QString stringValue() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline QXmlName qName() const { diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h index f8ce36d6..a530f9d4 100644 --- a/src/xmlpatterns/data/qschemadatetime_p.h +++ b/src/xmlpatterns/data/qschemadatetime_p.h @@ -79,9 +79,9 @@ namespace QPatternist */ static DateTime::Ptr fromLexical(const QString &string); static DateTime::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h index 432a890b..cc93d8a0 100644 --- a/src/xmlpatterns/data/qschematime_p.h +++ b/src/xmlpatterns/data/qschematime_p.h @@ -76,9 +76,9 @@ namespace QPatternist static SchemaTime::Ptr fromLexical(const QString &string); static SchemaTime::Ptr fromDateTime(const QDateTime &dt); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; - virtual Item fromValue(const QDateTime &dt) const; + ItemType::Ptr type() const override; + QString stringValue() const override; + Item fromValue(const QDateTime &dt) const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h index 4b9bfae8..1b246245 100644 --- a/src/xmlpatterns/data/qsorttuple_p.h +++ b/src/xmlpatterns/data/qsorttuple_p.h @@ -97,7 +97,7 @@ namespace QPatternist * This function is sometimes called by Literal::description(). * This function simply returns "SortTuple". */ - virtual QString stringValue() const; + QString stringValue() const override; /** * @short Always asserts. @@ -117,9 +117,9 @@ namespace QPatternist /** * @short Always asserts. */ - virtual bool hasError() const; + bool hasError() const override; - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; inline const Item::Vector &sortKeys() const { diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h index 49816b87..23da577a 100644 --- a/src/xmlpatterns/data/quntypedatomic_p.h +++ b/src/xmlpatterns/data/quntypedatomic_p.h @@ -78,7 +78,7 @@ namespace QPatternist */ static UntypedAtomic::Ptr fromValue(const QString &value); - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; protected: diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h index f71cac71..bd3054c5 100644 --- a/src/xmlpatterns/data/qvalidationerror_p.h +++ b/src/xmlpatterns/data/qvalidationerror_p.h @@ -86,17 +86,17 @@ namespace QPatternist /** * @returns always @c true */ - virtual bool hasError() const; + bool hasError() const override; /** * Always results in an assert crash. */ - virtual ItemType::Ptr type() const; + ItemType::Ptr type() const override; /** * Always results in an assert crash. */ - virtual QString stringValue() const; + QString stringValue() const override; /** * @returns the error code this ValidationError represents. Typically, this diff --git a/src/xmlpatterns/data/qvaluefactory.cpp b/src/xmlpatterns/data/qvaluefactory.cpp index f02d282e..a00dac50 100644 --- a/src/xmlpatterns/data/qvaluefactory.cpp +++ b/src/xmlpatterns/data/qvaluefactory.cpp @@ -71,7 +71,7 @@ public: return AtomicValue::Ptr(const_cast<AtomicValue *>(cast(lexicalValue, context).asAtomicValue())); } - const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_sourceReflection; } diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h index 7bc9dff9..74bb99f1 100644 --- a/src/xmlpatterns/data/qyearmonthduration_p.h +++ b/src/xmlpatterns/data/qyearmonthduration_p.h @@ -76,8 +76,8 @@ namespace QPatternist const YearProperty years, const MonthProperty months); - virtual ItemType::Ptr type() const; - virtual QString stringValue() const; + ItemType::Ptr type() const override; + QString stringValue() const override; /** * @returns the value of this @c xs:yearMonthDuration in months. @@ -85,47 +85,47 @@ namespace QPatternist * and XPath 2.0 Functions and Operators, 10.3.2.2 Calculating the value of a * xs:dayTimeDuration from the lexical representation</a> */ - virtual Value value() const; + Value value() const override; /** * If @p val is zero, is CommonValues::YearMonthDurationZero returned. */ - virtual Item fromValue(const Value val) const; + Item fromValue(const Value val) const override; /** * @returns the years component. Always positive. */ - virtual YearProperty years() const; + YearProperty years() const override; /** * @returns the months component. Always positive. */ - virtual MonthProperty months() const; + MonthProperty months() const override; /** * @returns always 0. */ - virtual DayCountProperty days() const; + DayCountProperty days() const override; /** * @returns always 0. */ - virtual HourProperty hours() const; + HourProperty hours() const override; /** * @returns always 0. */ - virtual MinuteProperty minutes() const; + MinuteProperty minutes() const override; /** * @returns always 0. */ - virtual SecondProperty seconds() const; + SecondProperty seconds() const override; /** * @returns always 0. */ - virtual MSecondProperty mseconds() const; + MSecondProperty mseconds() const override; protected: friend class CommonValues; diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index 6dd03041..27f45b68 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -73,17 +73,17 @@ namespace QPatternist AndExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index 63d81c44..8f7cb00e 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -90,11 +90,11 @@ namespace QPatternist const WithParam::Hash &withParams, const TemplateMode::Ptr &defaultMode); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * The only reason this function exists, is in order to convert @@ -108,11 +108,11 @@ namespace QPatternist inline TemplateMode::Ptr mode() const; - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; - Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: typedef QExplicitlySharedDataPointer<const ApplyTemplate> ConstPtr; diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index 3705f733..f2ffafb6 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -71,12 +71,12 @@ namespace QPatternist ArgumentReference(const SequenceType::Ptr &sourceType, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: const SequenceType::Ptr m_type; diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp index f21dbcba..a8100417 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression.cpp +++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp @@ -98,7 +98,7 @@ public: { } - virtual const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_reflection; } diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index e09635bd..f2201f77 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -78,14 +78,14 @@ namespace QPatternist const AtomicMathematician::Operator op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; AtomicMathematician::Operator operatorID() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; static Item flexiblyCalculate(const Item &op1, const AtomicMathematician::Operator op, @@ -105,7 +105,7 @@ namespace QPatternist const SourceLocationReflection *const reflection, const ReportContext::ErrorCode code = ReportContext::XPTY0004, const bool isCompat = false); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; protected: diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index 317d2bee..598f5e1a 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -71,25 +71,25 @@ namespace QPatternist AttributeConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDAttributeConstructor. */ - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: static inline QString processValue(const QXmlName name, diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index c61d43b2..8a66b2a1 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -73,18 +73,18 @@ namespace QPatternist public: AttributeNameValidator(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of its operand. This is returned as opposed * CommonSequenceTypes::ExactlyOneQName, since the operand might return a subtype * of @c xs:QName. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 30aa630d..68d62e29 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -70,8 +70,8 @@ namespace QPatternist AxisStep(const QXmlNodeModelIndex::Axis axis, const ItemType::Ptr &nodeTest); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Returns @p node if it matches the node test this step is using, otherwise @c null. @@ -79,23 +79,23 @@ namespace QPatternist inline Item mapToItem(const QXmlNodeModelIndex &node, const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Rewrites to ParentNodeAxis, if possible. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the axis this step is using. @@ -124,8 +124,8 @@ namespace QPatternist */ static QString axisName(const QXmlNodeModelIndex::Axis axis); - virtual ID id() const; - virtual PatternPriority patternPriority() const; + ID id() const override; + PatternPriority patternPriority() const override; inline void setAxis(const QXmlNodeModelIndex::Axis newAxis); diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index 136b8da4..17ec7c5b 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -73,14 +73,14 @@ namespace QPatternist CallTemplate(const QXmlName &name, const WithParam::Hash &withParams); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Properties dependencies() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Properties dependencies() const override; /** * This is a bit complicated by that we have two required types, one @@ -91,8 +91,8 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline void setTemplate(const Template::Ptr &templ) @@ -100,9 +100,9 @@ namespace QPatternist m_template = templ; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; private: Template::Ptr m_template; }; diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index eff56183..3412be20 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -73,7 +73,7 @@ namespace QPatternist CastableAs(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; /** * Overridden to const fold to @c true when the target type @@ -81,14 +81,14 @@ namespace QPatternist * the type identical to the target type, <tt>xs:string</tt>, * and <tt>xs:untypedAtomic</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index 3aeeef25..66fcf43f 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -91,9 +91,9 @@ namespace QPatternist CastAs(const Expression::Ptr &source, const SequenceType::Ptr &targetType); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the ItemType is this CastAs's @@ -101,21 +101,21 @@ namespace QPatternist * source operand to reflect whether this CastAs always will evaluate to * exactly-one or zero-or-one values. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Overridden in order to check that casting to an abstract type * is not attempted. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * If the target type is the same as the source type, it is rewritten * to the operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index ed04d438..15431e42 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -72,19 +72,19 @@ namespace QPatternist public: CollationChecker(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Expects exactly one string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns its operand's static type. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index 84991357..a56621b0 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -79,16 +79,16 @@ namespace QPatternist const Operator op, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; Operator operatorID() const; - virtual ID id() const; + ID id() const override; /** * Determines the string representation for operator @p op. @@ -98,7 +98,7 @@ namespace QPatternist */ static QString displayName(const Operator op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const Operator m_operator; diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index 6190a8d7..4e7312d9 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: CommentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QString evaluateContent(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index fa19bec4..6d5c1dc4 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -70,12 +70,12 @@ namespace QPatternist ComputedNamespaceConstructor(const Expression::Ptr &prefix, const Expression::Ptr &namespaceURI); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -84,10 +84,10 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 6c48e72e..a59837cf 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -77,39 +77,39 @@ namespace QPatternist { } - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination and RequiresContextItem */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always IDContextItem */ - virtual ID id() const; + ID id() const override; /** * @returns always BuiltinTypes::item; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual const SourceLocationReflection *actualReflection() const; - virtual void announceFocusType(const ItemType::Ptr &type); + const SourceLocationReflection *actualReflection() const override; + void announceFocusType(const ItemType::Ptr &type) override; private: ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index d481f672..d8148d2b 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -79,28 +79,28 @@ namespace QPatternist const bool inheritNSS, const bool preserveNSS); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &source, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Properties properties() const; - virtual ItemType::Ptr expectedContextItemType() const; + Properties properties() const override; + ItemType::Ptr expectedContextItemType() const override; private: typedef QExplicitlySharedDataPointer<const CopyOf> ConstPtr; diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index 63bfb4e5..7ef9a54d 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -69,23 +69,23 @@ namespace QPatternist public: CurrentItemStore(const Expression::Ptr &operand); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: static inline StaticContext::Ptr newStaticContext(const StaticContext::Ptr &context); diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index e3df4939..04cad26e 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -72,20 +72,20 @@ namespace QPatternist public: DocumentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; - virtual SequenceType::Ptr staticType() const; + Properties properties() const override; + SequenceType::Ptr staticType() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index d5fd1dde..17575c1d 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -76,27 +76,27 @@ namespace QPatternist const DynamicContext::Ptr &context, const Expression::ConstPtr &expr); - virtual void namespaceBinding(const QXmlName &nb); - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void namespaceBinding(const QXmlName &nb) override; + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); - virtual void atomicValue(const QVariant &value); - virtual void startOfSequence(); - virtual void endOfSequence(); + void startDocument() override; + void endDocument() override; + void atomicValue(const QVariant &value) override; + void startOfSequence() override; + void endOfSequence() override; private: QAbstractXmlReceiver *const m_receiver; diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index 66080ca6..3845143f 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -69,17 +69,17 @@ namespace QPatternist DynamicContextStore(const Expression::Ptr &operand, const DynamicContext::Ptr &context); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: DynamicContext *m_context; diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index 00492d75..ac63f9de 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -74,21 +74,21 @@ namespace QPatternist const Expression::Ptr &operand2, const bool isXSLT); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Properties properties() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index 5a8c8248..18cc0cbd 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -68,24 +68,24 @@ namespace QPatternist /** * @returns always an empty list. */ - virtual Expression::List operands() const; + Expression::List operands() const override; /** * Does nothing, since sub-classes has no operands. Calling * it makes hence no sense, and it also results in an assert crash. */ - virtual void setOperands(const Expression::List &); + void setOperands(const Expression::List &) override; protected: /** * @returns always @c true */ - virtual bool compressOperands(const StaticContext::Ptr &context); + bool compressOperands(const StaticContext::Ptr &context) override; /** * @returns always an empty list since it has no operands. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; }; } diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index e487d3f8..8a9a61d6 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -92,22 +92,22 @@ namespace QPatternist /** * @returns always an empty iterator, an instance of EmptyIterator. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * @returns always @c null. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Does nothing. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const override; /** * @returns always @c false. */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::Empty @@ -117,11 +117,11 @@ namespace QPatternist /** * @returns always CommonSequenceTypes::Empty */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index d3ac4222..c0e7b45d 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -96,22 +96,22 @@ namespace QPatternist const VariableDeclaration::Ptr &varDecl, const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual const SourceLocationReflection *actualReflection() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + const SourceLocationReflection *actualReflection() const override; inline VariableSlotID slot() const { diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 3e153431..9d74f113 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -759,12 +759,12 @@ namespace QPatternist /** * @short Returns @c this. */ - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; /** * Reimplementation of SourceLocationReflection::description(). */ - virtual QString description() const; + QString description() const override; /** * When this function is called, it signals that the parent will create diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 0818e902..d8602960 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -77,15 +77,15 @@ namespace QPatternist */ ExpressionSequence(const Expression::List &operands); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * Forwards the call to its children. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Removes any empty sequences, typically "()", from its list of children. If @@ -96,21 +96,21 @@ namespace QPatternist * optimizations have rewritten themselves into empty sequences. Thus, * saving memory consumption and runtime overhead. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline Item::Iterator::Ptr mapToSequence(const Expression::Ptr &, const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns Expression::DisableElimination, plus the union * of all this ExpressionSequence's children's properties. If any child * does not have IsEvaluated, it is removed from the result. */ - virtual Expression::Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: typedef QExplicitlySharedDataPointer<const ExpressionSequence> ConstPtr; }; diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index ed4047b9..55cb0426 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -75,15 +75,15 @@ namespace QPatternist ExpressionVariableReference(const VariableSlotID slot, const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual ID id() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + ID id() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index 09c61e81..06a759bf 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -73,18 +73,18 @@ namespace QPatternist ExternalVariableReference(const QXmlName &name, const SequenceType::Ptr &type); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QXmlName m_name; diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index efdca745..04174331 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -76,30 +76,30 @@ namespace QPatternist /** * @returns the first item, if any, from evaluating the source expression. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the item type is the same as the source expression * and where the cardinality is either Cardinality::zeroOrOne() or Cardinality::exactlyOne(), * depending on the source expression. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Rewrites <tt>expression[1][1]</tt> into <tt>expression[1]</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always IDFirstItemPredicate. */ - virtual ID id() const; + ID id() const override; }; } diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index 31ea033f..a7369f93 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -76,27 +76,27 @@ namespace QPatternist const Expression::Ptr &returnExpression, const VariableSlotID positionSlot); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; - virtual ID id() const; + ID id() const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; /** * Sets m_allowsMany properly. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: inline void riggPositionalVariable(const DynamicContext::Ptr &context, diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index b3fffca8..fcd86420 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -82,21 +82,21 @@ namespace QPatternist const bool isBackwardsCompat = false); ~GeneralComparison(); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDGeneralComparison */ - virtual ID id() const; + ID id() const override; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * @returns the operator that this GeneralComparison is using. @@ -109,7 +109,7 @@ namespace QPatternist /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: static inline void updateType(ItemType::Ptr &type, diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index 37ffeb3b..a5a78252 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -92,28 +92,28 @@ namespace QPatternist * its QAbstractXmlForwardIterator::next() calls, and since the Focus references the same QAbstractXmlForwardIterator, * the focus is automatically moved. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Doesn't return the first item from calling evaluateSequence(), but does the mapping * manually. This avoid allocating an ItemMappingIterator. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; inline Item mapToItem(const Item &subject, const DynamicContext::Ptr &) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; /** * @returns always CreatesFocusForLast. */ - virtual Properties properties() const; + Properties properties() const override; - virtual QString description() const; + QString description() const override; protected: @@ -130,7 +130,7 @@ namespace QPatternist /** * @returns the ItemType of the first operand's staticType(). */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; private: typedef QExplicitlySharedDataPointer<const GenericPredicate> ConstPtr; diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index d26ccb06..8cb1d78f 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -71,22 +71,22 @@ namespace QPatternist const Expression::Ptr &then, const Expression::Ptr &el); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns IDIfThenClause */ - virtual ID id() const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; - //virtual Properties properties() const; + ID id() const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; + //Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 519e8d2f..13e098db 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -72,12 +72,12 @@ namespace QPatternist InstanceOf(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns the SequenceType that this <tt>instance of</tt> Expression diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index f2c8ccf8..23ae2094 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -78,18 +78,18 @@ namespace QPatternist const Expression::Ptr &operand2, const VariableDeclaration::Ptr &decl); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: inline DynamicContext::Ptr bindVariable(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 7a16e8d0..556b6624 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -77,19 +77,19 @@ namespace QPatternist */ Literal(const Item &item); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual QString description() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + QString description() const override; /** * @returns Expression::DisableElimination and Expression::IsEvaluated */ - virtual Properties properties() const; + Properties properties() const override; /** * Declaring the return value of this function a const reference, leads diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index 0a4bde17..b9ad129a 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -79,14 +79,14 @@ namespace QPatternist */ LiteralSequence(const Item::List &list); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: const Item::List m_list; diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index 78aceafa..5a890137 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -69,12 +69,12 @@ namespace QPatternist NamespaceConstructor(const QXmlName nb); ~NamespaceConstructor(); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -83,17 +83,17 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; inline const QXmlName &namespaceBinding() const { return m_binding; } - virtual ID id() const; + ID id() const override; private: const QXmlName m_binding; }; diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index dc09003d..20e130df 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -75,16 +75,16 @@ namespace QPatternist NCNameConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Validates @p lexicalNCName as a processing instruction's target diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 48696e23..37d9c924 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -72,24 +72,24 @@ namespace QPatternist const QXmlNodeModelIndex::DocumentOrder op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; virtual QXmlNodeModelIndex::DocumentOrder operatorID() const; /** * If any operator is the empty sequence, the NodeComparison rewrites * into that, since the empty sequence is always the result in that case. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns either CommonSequenceTypes::ZeroOrOneBoolean or * CommonSequenceTypes::ExactlyOneBoolean depending on the static * cardinality of its operands. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Determines the string representation for a node comparison operator. @@ -101,7 +101,7 @@ namespace QPatternist */ static QString displayName(const QXmlNodeModelIndex::DocumentOrder op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: enum Result { diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index 1be2469d..8561785d 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -68,12 +68,12 @@ namespace QPatternist public: NodeSortExpression(const Expression::Ptr &operand); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * Ensures that result delivered from @p operand, is in document order. diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index 2ed424a8..5a00cd5e 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -68,7 +68,7 @@ namespace QPatternist { public: ByIDIdentifier(const Expression::ID id); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const Expression::ID m_id; }; @@ -100,7 +100,7 @@ namespace QPatternist * the SequenceType passed in the BySequenceTypeIdentifier() * constructor, otherwise @c false. */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const SequenceType::Ptr m_seqType; @@ -135,7 +135,7 @@ namespace QPatternist * @returns @c true, if @p expr is a ValueComparison with the operator * passed in ComparisonIdentifier(). */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const QVector<Expression::ID> m_hosts; @@ -156,7 +156,7 @@ namespace QPatternist { public: IntegerIdentifier(const xsInteger num); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const xsInteger m_num; @@ -175,7 +175,7 @@ namespace QPatternist { public: BooleanIdentifier(const bool value); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const bool m_value; @@ -198,9 +198,9 @@ namespace QPatternist * of the type that @p id identifies. */ ByIDCreator(const Expression::ID id); - virtual Expression::Ptr create(const Expression::List &operands, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r) const; + Expression::Ptr create(const Expression::List &operands, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) const override; /** * Creates an expression by id @p id with the arguments @p operands. diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index dcc567b7..40a0d20d 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -147,17 +147,17 @@ namespace QPatternist const Expression::Ptr &operand, ReturnOrderBy *const returnOrderBy); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item::Iterator::Ptr mapToSequence(const Item &i, const DynamicContext::Ptr &context) const; - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index eb2d2bde..3e508867 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -70,10 +70,10 @@ namespace QPatternist OrExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index 7d864a6e..ddcd8fdd 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -66,9 +66,9 @@ namespace QPatternist class PairContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: PairContainer(const Expression::Ptr &operand1, const Expression::Ptr &operand2); diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index cede13b5..58dfde16 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -71,24 +71,24 @@ namespace QPatternist class ParentNodeAxis : public EmptyContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always CommonSequenceTypes::ExactlyOneNode; */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; }; } diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index f3e3b59e..cab190d6 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -96,35 +96,35 @@ namespace QPatternist const Kind kind = RegularPath); ~Path(); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of the last step where the cardinality is multiplied with * the cardinality of the first step's cardinality. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the item type of the last step's static type. */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; - virtual ID id() const; + ID id() const override; inline void setLast(); diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index 91be948b..27288929 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -69,7 +69,7 @@ namespace QPatternist typedef QExplicitlySharedDataPointer<PositionalVariableReference> Ptr; PositionalVariableReference(const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Returns always @c true, since a positional variable is always one or more, and the @@ -77,15 +77,15 @@ namespace QPatternist * * @returns always @c true */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::ExactlyOneInteger */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index 93751040..8593174c 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -71,20 +71,20 @@ namespace QPatternist ProcessingInstructionConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Both arguments must of type @c xs:string. It is assumes that the first argument's * lexical space is @c xs:NCName. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QXmlName evaluateTardata(const DynamicContext::Ptr &context) const; /** diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index 6aab3229..49fcb07c 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -75,13 +75,13 @@ namespace QPatternist QNameConstructor(const Expression::Ptr &source, const NamespaceResolver::Ptr &nsResolver); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Expands @p lexicalQName, which is a lexical representation of a QName such as "x:body", into @@ -121,7 +121,7 @@ namespace QPatternist const StaticContext::Ptr &context, const SourceLocationReflection *const r); - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: const NamespaceResolver::Ptr m_nsResolver; diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index b4483686..29a9e268 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -78,9 +78,9 @@ namespace QPatternist const Expression::Ptr &inClause, const Expression::Ptr &testExpression); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; Operator operatorID() const; @@ -92,7 +92,7 @@ namespace QPatternist */ static QString displayName(const Operator quantifier); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index e5c41a13..f26cf5d9 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -73,20 +73,20 @@ namespace QPatternist public: RangeExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * It's likely that this function gets called if staticType() inferred * the cardinality to an exact number. In that case, we know that the * first arguments is the same as the second argument. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns always CommonSequenceTypes::ZeroOrMoreIntegers */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Disables compression for optimization reasons. For example, the @@ -95,9 +95,9 @@ namespace QPatternist * * @returns Expression::DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index 85336c5f..406fe20b 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -73,17 +73,17 @@ namespace QPatternist RangeVariableReference(const Expression::Ptr &sourceExpression, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns IDRangeVariableReference */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; private: const Expression::Ptr m_sourceExpression; }; diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index 3ea9df92..1f8b2c12 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -77,13 +77,13 @@ namespace QPatternist const OrderBy::OrderSpec::Vector &oSpecs, const Expression::List &operands); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline OrderBy::OrderSpec::Vector orderSpecs() const { @@ -107,7 +107,7 @@ namespace QPatternist m_flyAway = !a; } - virtual Properties properties() const; + Properties properties() const override; private: /** * This variable is unfortunately only used at compile time. However, diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index 595018f2..144d0bd7 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -74,14 +74,14 @@ namespace QPatternist public: SimpleContentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 6d016be2..ec12f8f3 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -67,10 +67,10 @@ namespace QPatternist public: ~SingleContainer(); - virtual Expression::List operands() const; + Expression::List operands() const override; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: SingleContainer(const Expression::Ptr &operand); diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 3405aac2..20302182 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -111,8 +111,8 @@ namespace QPatternist Q_ASSERT(r); } - virtual const SourceLocationReflection *actualReflection() const; - virtual QString description() const; + const SourceLocationReflection *actualReflection() const override; + QString description() const override; private: const SourceLocationReflection *const m_r; diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index f0783f28..44d6e789 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -74,11 +74,11 @@ namespace QPatternist */ StaticBaseURIStore(const QUrl &baseURI, const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QUrl m_baseURI; diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index e3c8986d..c2ba6b1b 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -73,11 +73,11 @@ namespace QPatternist * absolute. */ StaticCompatibilityStore(const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index 5ec3ad4b..c51f4052 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -97,7 +97,7 @@ namespace QPatternist /** * Returns @c this. */ - virtual const SourceLocationReflection* actualReflection() const; + const SourceLocationReflection* actualReflection() const override; const ImportPrecedence importPrecedence; diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index c389543c..934e5469 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -76,7 +76,7 @@ namespace QPatternist class TemplateInvoker : public CallSite { public: - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline const WithParam::Hash &withParams() const; WithParam::Hash m_withParams; @@ -90,7 +90,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; protected: /** * @p withParams may be empty. diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index d9e17224..2441b22f 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -69,13 +69,13 @@ namespace QPatternist public: TemplateParameterReference(const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 7357d041..f0210658 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: TextNodeConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index f9acf69b..2d7b5418 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -90,21 +90,21 @@ namespace QPatternist * is verified. Then, the type the <tt>treat as</tt> expression itself must match, @p reqType, * is verified. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const SequenceType::Ptr m_reqType; diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index 3fec57d3..9e9f9ab4 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -65,10 +65,10 @@ namespace QPatternist class TripleContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; protected: TripleContainer(const Expression::Ptr &operand1, diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 3362c14a..d019a0ea 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -96,8 +96,8 @@ namespace QPatternist return CommonValues::emptyIterator; } - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index 77da0c75..83c58702 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -96,7 +96,7 @@ namespace QPatternist const Expression::Ptr &operand, const StaticContext::Ptr &context); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: Q_DISABLE_COPY(UnaryExpression) diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index e03f6e49..80ce878b 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -73,14 +73,14 @@ namespace QPatternist */ UnlimitedContainer(const Expression::List &operands = Expression::List()); - virtual void setOperands(const Expression::List &list); + void setOperands(const Expression::List &list) override; - virtual Expression::List operands() const; + Expression::List operands() const override; /** * @note This function cannot be called before setOperands is called. */ - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; /** * Tells how operandsUnionType() should compute the cardinality of diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index 348d73e3..aface34c 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -72,12 +72,12 @@ namespace QPatternist public: UnresolvedVariableReference(const QXmlName &name); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline void bindTo(const Expression::Ptr &body); diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index 006540ab..5b9bf7d6 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -81,35 +81,35 @@ namespace QPatternist UserFunctionCallsite(const QXmlName name, const FunctionSignature::Arity arity); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * We call compress on our body. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; /** * @short Returns the types declared in the function declaration. * * @see CallTemplate::expectedOperandTypes() */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDUserFunctionCallsite. */ - virtual ID id() const; + ID id() const override; /** * If @p slotOffset is -1, it means this function has no arguments. @@ -125,13 +125,13 @@ namespace QPatternist FunctionSignature::Arity arity() const; - inline Expression::Ptr body() const + inline Expression::Ptr body() const override { return m_body; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + CallTargetDescription::Ptr callTargetDescription() const override; private: /** diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 9566dfb2..b2466a71 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -79,30 +79,30 @@ namespace QPatternist const Expression::Ptr &op2); ~ValueComparison(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns IDValueComparison */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the operator that this ValueComparison is using. diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index 807b55b3..ce9c784f 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -91,7 +91,7 @@ namespace QPatternist /** * @returns DisableElimination */ - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index afa49df0..002fcf93 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -69,10 +69,10 @@ namespace QPatternist { public: XSLTSimpleContentConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; private: static inline QString processItem(const Item &item, bool &discard, diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index 6a65308f..7b634d58 100644 --- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h @@ -71,12 +71,12 @@ namespace QPatternist class AbstractFunctionFactory : public FunctionFactory { public: - virtual Expression::Ptr createFunctionCall(const QXmlName name, - const Expression::List &arguments, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r); + Expression::Ptr createFunctionCall(const QXmlName name, + const Expression::List &arguments, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) override; - virtual FunctionSignature::Hash functionSignatures() const; + FunctionSignature::Hash functionSignatures() const override; protected: /** diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h index b132d99e..052d630f 100644 --- a/src/xmlpatterns/functions/qaccessorfns_p.h +++ b/src/xmlpatterns/functions/qaccessorfns_p.h @@ -74,7 +74,7 @@ namespace QPatternist class NodeNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -86,7 +86,7 @@ namespace QPatternist class NilledFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -98,9 +98,9 @@ namespace QPatternist class StringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class BaseURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -123,7 +123,7 @@ namespace QPatternist class DocumentURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h index d1a09ef3..cca1bd81 100644 --- a/src/xmlpatterns/functions/qaggregatefns_p.h +++ b/src/xmlpatterns/functions/qaggregatefns_p.h @@ -79,20 +79,20 @@ namespace QPatternist class CountFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * If @p reqType is CommonSequenceTypes::EBV, this function call is rewritten * into a call to <tt>fn:exists()</tt>. Hence, <tt>if(count(X)) then ...</tt> is * rewritten into <tt>if(exists(X)) then ...</tt>. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * If CountFN's operand has a Cardinality that is exact, as per Cardinality::isExact(), * it is rewritten to the Cardinality's count. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; }; /** @@ -104,8 +104,8 @@ namespace QPatternist class AddingAggregate : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; protected: AtomicMathematician::Ptr m_mather; }; @@ -119,11 +119,11 @@ namespace QPatternist class AvgFN : public AddingAggregate { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; private: AtomicMathematician::Ptr m_adder; AtomicMathematician::Ptr m_divider; @@ -138,10 +138,10 @@ namespace QPatternist class SumFN : public AddingAggregate { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h index 81e3a1e8..2babae50 100644 --- a/src/xmlpatterns/functions/qaggregator_p.h +++ b/src/xmlpatterns/functions/qaggregator_p.h @@ -79,7 +79,7 @@ namespace QPatternist * @returns a static type where the ItemType is the same as this FunctionCall's first * argument, and the Cardinality is as return from Cardinality::toWithoutMany(). */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h index 0624e5a2..e5ab7ab2 100644 --- a/src/xmlpatterns/functions/qassemblestringfns_p.h +++ b/src/xmlpatterns/functions/qassemblestringfns_p.h @@ -76,7 +76,7 @@ namespace QPatternist class CodepointsToStringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -88,7 +88,7 @@ namespace QPatternist class StringToCodepointsFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h index cefccfba..ffc0589d 100644 --- a/src/xmlpatterns/functions/qbooleanfns_p.h +++ b/src/xmlpatterns/functions/qbooleanfns_p.h @@ -77,7 +77,7 @@ namespace QPatternist class TrueFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -91,7 +91,7 @@ namespace QPatternist class FalseFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -103,8 +103,8 @@ namespace QPatternist class NotFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; }; } diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h index 9dce6bb5..1356cefc 100644 --- a/src/xmlpatterns/functions/qcomparescaseaware_p.h +++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h @@ -71,7 +71,7 @@ namespace QPatternist */ ComparesCaseAware(); - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Tells whether the return value of the two operands must be compared diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h index 56691e07..2af617db 100644 --- a/src/xmlpatterns/functions/qcomparestringfns_p.h +++ b/src/xmlpatterns/functions/qcomparestringfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class CodepointEqualFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class CompareFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h index 896d2f83..7228c8d2 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator_p.h +++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h @@ -88,9 +88,9 @@ namespace QPatternist public CastingPlatform<ComparingAggregator<oper, result>, true> { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h index 69aadad4..00e39580 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h @@ -72,12 +72,12 @@ namespace QPatternist public: ConstructorFunctionsFactory(const NamePool::Ptr &np, const SchemaTypeFactory::Ptr &); - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; private: const SchemaTypeFactory::Ptr m_typeFactory; diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h index f3743b3a..beaeff79 100644 --- a/src/xmlpatterns/functions/qcontextfns_p.h +++ b/src/xmlpatterns/functions/qcontextfns_p.h @@ -76,7 +76,7 @@ namespace QPatternist class PositionFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -90,7 +90,7 @@ namespace QPatternist class LastFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -104,7 +104,7 @@ namespace QPatternist class ImplicitTimezoneFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -118,7 +118,7 @@ namespace QPatternist class CurrentDateTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -132,7 +132,7 @@ namespace QPatternist class CurrentDateFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -146,7 +146,7 @@ namespace QPatternist class CurrentTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -162,8 +162,8 @@ namespace QPatternist class DefaultCollationFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -179,8 +179,8 @@ namespace QPatternist class StaticBaseURIFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h index 8af5544f..cc1ad326 100644 --- a/src/xmlpatterns/functions/qcurrentfn_p.h +++ b/src/xmlpatterns/functions/qcurrentfn_p.h @@ -67,11 +67,11 @@ namespace QPatternist class CurrentFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; private: ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h index bc40200d..986ec893 100644 --- a/src/xmlpatterns/functions/qdatetimefn_p.h +++ b/src/xmlpatterns/functions/qdatetimefn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class DateTimeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h index 3cb0326c..71ff1218 100644 --- a/src/xmlpatterns/functions/qdatetimefns_p.h +++ b/src/xmlpatterns/functions/qdatetimefns_p.h @@ -94,7 +94,7 @@ namespace QPatternist * Takes care of the argument handling, and, if applicable, * calls extract() with the value of the operand. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -193,7 +193,7 @@ namespace QPatternist * Takes care of the argument handling, and, if applicable, * calls extract() with the value of the operand. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h index a5788834..1166d988 100644 --- a/src/xmlpatterns/functions/qdeepequalfn_p.h +++ b/src/xmlpatterns/functions/qdeepequalfn_p.h @@ -72,9 +72,9 @@ namespace QPatternist { } - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h index 4be225e7..d9750bd9 100644 --- a/src/xmlpatterns/functions/qdocumentfn_p.h +++ b/src/xmlpatterns/functions/qdocumentfn_p.h @@ -108,8 +108,8 @@ namespace QPatternist class DocumentFN : public FunctionCall { public: - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h index 1e2216d8..435202bc 100644 --- a/src/xmlpatterns/functions/qelementavailablefn_p.h +++ b/src/xmlpatterns/functions/qelementavailablefn_p.h @@ -69,7 +69,7 @@ namespace QPatternist { public: ElementAvailableFN(); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; private: static QSet<QString> allXSLTInstructions(); diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h index 5105c212..a4df73ef 100644 --- a/src/xmlpatterns/functions/qerrorfn_p.h +++ b/src/xmlpatterns/functions/qerrorfn_p.h @@ -75,8 +75,8 @@ namespace QPatternist class ErrorFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual FunctionSignature::Ptr signature() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + FunctionSignature::Ptr signature() const override; }; } diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h index 860055f7..57da501b 100644 --- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h +++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h @@ -68,13 +68,13 @@ namespace QPatternist class FunctionAvailableFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Reimplemented to store data from the @p context which is needed at runtime. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: FunctionFactory::Ptr m_functionFactory; diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h index 03068c52..474ed3e2 100644 --- a/src/xmlpatterns/functions/qfunctioncall_p.h +++ b/src/xmlpatterns/functions/qfunctioncall_p.h @@ -71,20 +71,20 @@ namespace QPatternist public: typedef QExplicitlySharedDataPointer<FunctionCall> Ptr; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; virtual void setSignature(const FunctionSignature::Ptr &sign); virtual FunctionSignature::Ptr signature() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual ID id() const; + ID id() const override; private: FunctionSignature::Ptr m_signature; diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h index 2adbdc1f..056b00b1 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h +++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h @@ -76,15 +76,15 @@ namespace QPatternist /** * Creates a function call node. */ - virtual Expression::Ptr createFunctionCall(const QXmlName, - const Expression::List &arguments, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r); - virtual bool isAvailable(const NamePool::Ptr &np, const QXmlName name, const xsInteger arity); + Expression::Ptr createFunctionCall(const QXmlName, + const Expression::List &arguments, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) override; + bool isAvailable(const NamePool::Ptr &np, const QXmlName name, const xsInteger arity) override; - virtual FunctionSignature::Hash functionSignatures() const; + FunctionSignature::Hash functionSignatures() const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; /** * @return a FunctionFactory containing all core functions and constructor diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h index 5e4aa1e2..8d37de02 100644 --- a/src/xmlpatterns/functions/qgenerateidfn_p.h +++ b/src/xmlpatterns/functions/qgenerateidfn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class GenerateIDFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h index cfb1faa6..9469953a 100644 --- a/src/xmlpatterns/functions/qnodefns_p.h +++ b/src/xmlpatterns/functions/qnodefns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class NameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class LocalNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class NamespaceURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -114,15 +114,15 @@ namespace QPatternist public CastingPlatform<NumberFN, false> { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Overridden in order to call CastingPlatform::prepareCasting(). It also * implements the optimization of rewriting to its operand if its * type is xs:double(since the <tt>fn:number()</tt> call is in that case superflorous). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always BuiltinTypes::xsDouble. @@ -142,7 +142,7 @@ namespace QPatternist class LangFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: static inline bool isLangMatch(const QString &candidate, const QString &toMatch); @@ -157,11 +157,11 @@ namespace QPatternist class RootFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Infers its cardinality from the argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h index 1f56d845..04f805dd 100644 --- a/src/xmlpatterns/functions/qnumericfns_p.h +++ b/src/xmlpatterns/functions/qnumericfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class FloorFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class AbsFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class RoundFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class CeilingFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -125,7 +125,7 @@ namespace QPatternist class RoundHalfToEvenFN : public Aggregator { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h index f95bb422..cdf43222 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h +++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h @@ -75,7 +75,7 @@ namespace QPatternist { public: MatchesFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -88,11 +88,11 @@ namespace QPatternist { public: ReplaceFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Overridden to attempt to pre-compile the replacement string. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: /** @@ -121,7 +121,7 @@ namespace QPatternist public: TokenizeFN(); inline Item mapToItem(const QString &subject, const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; private: typedef QExplicitlySharedDataPointer<const TokenizeFN> ConstPtr; diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index 462f0164..54838cec 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -102,7 +102,7 @@ namespace QPatternist }; typedef QFlags<Flag> Flags; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Retrieves the pattern supplied in the arguments, taking care of compiling it, diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h index 9264974e..b2b9fcb7 100644 --- a/src/xmlpatterns/functions/qqnamefns_p.h +++ b/src/xmlpatterns/functions/qqnamefns_p.h @@ -75,7 +75,7 @@ namespace QPatternist class QNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -87,7 +87,7 @@ namespace QPatternist class ResolveQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -99,7 +99,7 @@ namespace QPatternist class PrefixFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -111,7 +111,7 @@ namespace QPatternist class LocalNameFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -123,7 +123,7 @@ namespace QPatternist class NamespaceURIFromQNameFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -135,7 +135,7 @@ namespace QPatternist class NamespaceURIForPrefixFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -147,7 +147,7 @@ namespace QPatternist class InScopePrefixesFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h index 40271f55..a289c3d3 100644 --- a/src/xmlpatterns/functions/qresolveurifn_p.h +++ b/src/xmlpatterns/functions/qresolveurifn_p.h @@ -65,9 +65,9 @@ namespace QPatternist class ResolveURIFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; } diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index 82b430be..16a79a82 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_p.h @@ -80,15 +80,15 @@ namespace QPatternist class BooleanFN : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * If @p reqType is CommonSequenceTypes::EBV, the type check of * the operand is returned. Hence, this removes redundant calls * to <tt>fn:boolean()</tt>. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; }; /** @@ -105,9 +105,9 @@ namespace QPatternist { } - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline AtomicComparator::Operator operatorID() const { @@ -128,7 +128,7 @@ namespace QPatternist class Existence : public FunctionCall { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const + bool evaluateEBV(const DynamicContext::Ptr &context) const override { if(Id == IDExistsFN) return !m_operands.first()->evaluateSequence(context)->isEmpty(); @@ -140,7 +140,7 @@ namespace QPatternist * Attempts to rewrite to @c false or @c true by looking at the static * cardinality of its operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context) + Expression::Ptr compress(const StaticContext::Ptr &context) override { // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is // passed directly into another constructor. @@ -191,14 +191,14 @@ namespace QPatternist { } - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Performs necessary type checks, but also implements the optimization * of rewriting to its operand if the operand's cardinality is zero-or-one * or exactly-one. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns a type whose item type is the type of the first operand, and * a cardinality which is non-empty if the first operand's type is non-empty @@ -206,7 +206,7 @@ namespace QPatternist * cardinality 2+, since distinct-values possibly removes items from the * source sequence. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; protected: inline AtomicComparator::Operator operatorID() const @@ -226,8 +226,8 @@ namespace QPatternist class InsertBeforeFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Implements the static enferences rules. The function's static item type @@ -238,7 +238,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_insert_before">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.15 The fn:insert-before function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -250,8 +250,8 @@ namespace QPatternist class RemoveFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Implements the static enferences rules, "Since one item may be removed @@ -265,7 +265,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_remove">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.11 The fn:remove function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -278,9 +278,9 @@ namespace QPatternist { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * Formally speaking, the type inference is: @@ -293,7 +293,7 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) * and XPath 2.0 Formal Semantics, 7.2.12 The fn:reverse function</a> * @returns the static type of the function's first argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; /** @@ -307,18 +307,18 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) { public: SubsequenceFN(); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * This function implements rewrites the SubsequenceFN instance into an * empty sequence if its third argument, the sequence length argument, is * evaluated and is effectively equal or less than zero. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Partially implements the static type inference rules. @@ -326,7 +326,7 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fn_subsequence">XQuery 1.0 * and XPath 2.0 Formal Semantics, 7.2.13 The fn:subsequence function</a> */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; private: bool m_hasTypeChecked; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp index 28c91341..90169119 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp +++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp @@ -87,9 +87,9 @@ class StringSplitter : public QAbstractXmlForwardIterator<QString> { public: StringSplitter(const Item::Iterator::Ptr &source); - virtual QString next(); - virtual QString current() const; - virtual qint64 position() const; + QString next() override; + QString current() const override; + qint64 position() const override; private: QString loadNext(); const Item::Iterator::Ptr m_source; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h index 30dab9f3..83f2ee50 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h +++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h @@ -79,13 +79,13 @@ namespace QPatternist IdFN(); typedef QPair<DynamicContext::Ptr, const QAbstractXmlNodeModel *> IDContext; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; inline Item mapToItem(const QString &id, const IDContext &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: typedef QExplicitlySharedDataPointer<const IdFN> ConstPtr; @@ -101,7 +101,7 @@ namespace QPatternist class IdrefFN : public ContextNodeChecker { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; /** @@ -113,7 +113,7 @@ namespace QPatternist class DocFN : public StaticBaseUriContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * The implementation of this function is placed in a different compilation unit, @@ -124,9 +124,9 @@ namespace QPatternist * href="http://onesearch.sun.com/search/onesearch/index.jsp?qt=6532605&site=sunsolve&otf=ss&col=support-sunsolve&otf=sunsolve&site=ss&col=search-sunsolve">Sun, * multiply-defined label for template instance, bug 6532605</a> */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; private: SequenceType::Ptr m_type; @@ -141,7 +141,7 @@ namespace QPatternist class DocAvailableFN : public StaticBaseUriContainer { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; /** @@ -153,7 +153,7 @@ namespace QPatternist class CollectionFN : public FunctionCall { public: - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h index 0599415e..43673914 100644 --- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h +++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h @@ -86,8 +86,8 @@ namespace QPatternist * Calls prepareStaticBaseURI(), and return the return value of * FunctionCall::typeCheck(), forwarding the arguments. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType) + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override { prepareStaticBaseURI(context); return FunctionCall::typeCheck(context, reqType); diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h index 2f15b7f7..88c515ce 100644 --- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h +++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h @@ -78,8 +78,8 @@ namespace QPatternist /** * Reimplemented to store data from the @p context. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; protected: /** diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h index ed8bca9e..7367632b 100644 --- a/src/xmlpatterns/functions/qstringvaluefns_p.h +++ b/src/xmlpatterns/functions/qstringvaluefns_p.h @@ -77,7 +77,7 @@ namespace QPatternist class ConcatFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -89,14 +89,14 @@ namespace QPatternist class StringJoinFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Optimization: when the cardinality of the sequence of items to join * cannot be two or more, we have no effect and therefore rewrite * ourselves to our first operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; }; /** @@ -108,7 +108,7 @@ namespace QPatternist class SubstringFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -120,7 +120,7 @@ namespace QPatternist class StringLengthFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -132,7 +132,7 @@ namespace QPatternist class NormalizeSpaceFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -152,8 +152,8 @@ namespace QPatternist * Initializes private data. */ NormalizeUnicodeFN(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: int determineNormalizationForm(const DynamicContext::Ptr &context) const; @@ -169,7 +169,7 @@ namespace QPatternist class UpperCaseFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -182,7 +182,7 @@ namespace QPatternist class LowerCaseFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -194,7 +194,7 @@ namespace QPatternist class TranslateFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -212,7 +212,7 @@ namespace QPatternist * is returned. Otherwise, the item's string value is returned percent encoded * as specified in this class's constructor. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; protected: /** diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h index d1fcb756..1e6b0528 100644 --- a/src/xmlpatterns/functions/qsubstringfns_p.h +++ b/src/xmlpatterns/functions/qsubstringfns_p.h @@ -73,7 +73,7 @@ namespace QPatternist class ContainsFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -85,7 +85,7 @@ namespace QPatternist class StartsWithFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -97,7 +97,7 @@ namespace QPatternist class EndsWithFN : public ComparesCaseAware { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -109,7 +109,7 @@ namespace QPatternist class SubstringBeforeFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; /** @@ -121,7 +121,7 @@ namespace QPatternist class SubstringAfterFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h index cc347f6a..8312aa0c 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn_p.h +++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class SystemPropertyFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: /** diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h index 5c933ed9..3c61fd26 100644 --- a/src/xmlpatterns/functions/qtimezonefns_p.h +++ b/src/xmlpatterns/functions/qtimezonefns_p.h @@ -82,7 +82,7 @@ namespace QPatternist class AdjustTimezone : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; protected: virtual Item createValue(const QDateTime &dt) const = 0; @@ -97,7 +97,7 @@ namespace QPatternist class AdjustDateTimeToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; /** @@ -109,7 +109,7 @@ namespace QPatternist class AdjustDateToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; /** @@ -121,7 +121,7 @@ namespace QPatternist class AdjustTimeToTimezoneFN : public AdjustTimezone { protected: - virtual Item createValue(const QDateTime &dt) const; + Item createValue(const QDateTime &dt) const override; }; } diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h index 2e5a31d9..b4234028 100644 --- a/src/xmlpatterns/functions/qtracefn_p.h +++ b/src/xmlpatterns/functions/qtracefn_p.h @@ -64,8 +64,8 @@ namespace QPatternist class TraceFN : public FunctionCall { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Formally speaking, the type inference is: @@ -79,7 +79,7 @@ statEnv |- (FN-URI,"trace")(Type) : prime(Type) * quantifier(Type) * an example of where the type inference is used * @returns the static type of the function's first argument. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; }; } diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h index 6dc57a43..8dd19871 100644 --- a/src/xmlpatterns/functions/qtypeavailablefn_p.h +++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h @@ -68,13 +68,13 @@ namespace QPatternist class TypeAvailableFN : public StaticNamespacesContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Reimplemented to store data from the @p context which is needed at runtime. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; private: SchemaTypeFactory::Ptr m_schemaTypeFactory; diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h index 206cb162..6029202c 100644 --- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h +++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class UnparsedEntityPublicIDFN : public ContextNodeChecker { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h index eaf51c64..74f73b95 100644 --- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h +++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h @@ -67,7 +67,7 @@ namespace QPatternist class UnparsedEntityURIFN : public ContextNodeChecker { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h index eb4d049a..6ca320ce 100644 --- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class UnparsedTextAvailableFN : public StaticBaseUriContainer { public: - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h index aa807cb4..5899598c 100644 --- a/src/xmlpatterns/functions/qunparsedtextfn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h @@ -68,7 +68,7 @@ namespace QPatternist class UnparsedTextFN : public StaticBaseUriContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; }; } diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h index 8a6fcd86..9797229b 100644 --- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h @@ -75,10 +75,10 @@ namespace QPatternist * createFunctionCall(), once it have been determined the function actually * exists and have the correct arity. */ - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name); + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, const QXmlName name) override; }; } diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h index 2a78a7c1..91d87f26 100644 --- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h @@ -76,12 +76,12 @@ namespace QPatternist class XPath20CoreFunctions : public AbstractFunctionFactory { protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, - const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, + const QXmlName name) override; }; } diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h index b0dc87cc..e68e4385 100644 --- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h @@ -74,12 +74,12 @@ namespace QPatternist class XSLT20CoreFunctions : public AbstractFunctionFactory { protected: - virtual Expression::Ptr retrieveExpression(const QXmlName name, - const Expression::List &args, - const FunctionSignature::Ptr &sign) const; + Expression::Ptr retrieveExpression(const QXmlName name, + const Expression::List &args, + const FunctionSignature::Ptr &sign) const override; - virtual FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, - const QXmlName name); + FunctionSignature::Ptr retrieveFunctionSignature(const NamePool::Ptr &np, + const QXmlName name) override; }; } |