summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2017-11-28 11:42:05 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2019-09-02 16:20:28 +0300
commit3101514787f7f3a451514b2ef3fc6e7bcfe1f0ce (patch)
tree9c72b4942b123ab284884dd10c1998a306b94fc9
parentff5d1f797f0131d395f8d092cd69dfebf9f7dc15 (diff)
downloadqtxmlpatterns-3101514787f7f3a451514b2ef3fc6e7bcfe1f0ce.tar.gz
data: Add missing override and remove redundant virtual
Change-Id: Ic114d4c1243f4c6f10cbf6ece408e2f7586e17fc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-rw-r--r--src/xmlpatterns/data/qabstractfloat_p.h34
-rw-r--r--src/xmlpatterns/data/qabstractfloatcasters_p.h12
-rw-r--r--src/xmlpatterns/data/qabstractfloatmathematician_p.h8
-rw-r--r--src/xmlpatterns/data/qanyuri_p.h2
-rw-r--r--src/xmlpatterns/data/qatomiccasters_p.h168
-rw-r--r--src/xmlpatterns/data/qatomiccomparators_p.h94
-rw-r--r--src/xmlpatterns/data/qatomicmathematicians_p.h64
-rw-r--r--src/xmlpatterns/data/qatomicstring_p.h6
-rw-r--r--src/xmlpatterns/data/qbase64binary_p.h4
-rw-r--r--src/xmlpatterns/data/qboolean_p.h6
-rw-r--r--src/xmlpatterns/data/qcomparisonfactory.cpp2
-rw-r--r--src/xmlpatterns/data/qdate_p.h6
-rw-r--r--src/xmlpatterns/data/qdaytimeduration_p.h22
-rw-r--r--src/xmlpatterns/data/qdecimal_p.h34
-rw-r--r--src/xmlpatterns/data/qderivedinteger_p.h34
-rw-r--r--src/xmlpatterns/data/qderivedstring_p.h6
-rw-r--r--src/xmlpatterns/data/qduration_p.h22
-rw-r--r--src/xmlpatterns/data/qgday_p.h4
-rw-r--r--src/xmlpatterns/data/qgmonth_p.h4
-rw-r--r--src/xmlpatterns/data/qgmonthday_p.h4
-rw-r--r--src/xmlpatterns/data/qgyear_p.h4
-rw-r--r--src/xmlpatterns/data/qgyearmonth_p.h4
-rw-r--r--src/xmlpatterns/data/qhexbinary_p.h4
-rw-r--r--src/xmlpatterns/data/qinteger_p.h34
-rw-r--r--src/xmlpatterns/data/qqnamevalue_p.h4
-rw-r--r--src/xmlpatterns/data/qschemadatetime_p.h6
-rw-r--r--src/xmlpatterns/data/qschematime_p.h6
-rw-r--r--src/xmlpatterns/data/qsorttuple_p.h6
-rw-r--r--src/xmlpatterns/data/quntypedatomic_p.h2
-rw-r--r--src/xmlpatterns/data/qvalidationerror_p.h6
-rw-r--r--src/xmlpatterns/data/qvaluefactory.cpp2
-rw-r--r--src/xmlpatterns/data/qyearmonthduration_p.h22
32 files changed, 316 insertions, 320 deletions
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h
index 593e400..80ff60c 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 84ffca6..917f0f2 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 395337d..7133335 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 2d290fe..aa0ac45 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 ae0f2fc..59448ba 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 b46d06b..4f23e2e 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 c8831ea..c8f8665 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 82368db..1a16d12 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 38db3b1..67ef982 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 1bcd075..0aa1766 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 793f724..13aefd5 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 1796f67..1ace503 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 9c5334f..4b08c19 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 68fa573..4cd7c28 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 bd700fc..6fe0290 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 b37e77e..dea83d2 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 975aa43..e88da41 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 60b327f..ef5f0b6 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 6f8686f..49b4c35 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 a9d8891..5d9e198 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 6d3b5a2..bf0e9cb 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 896cf9b..167a6b6 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 e10845a..6583de3 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 4f4dbe5..50cc9aa 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 a14dd87..0aa349f 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 f8ce36d..a530f9d 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 432a890..cc93d8a 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 4b9bfae..1b24624 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 49816b8..23da577 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 f71cac7..bd3054c 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 f02d282..a00dac5 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 7bc9dff..74bb99f 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;