diff options
Diffstat (limited to 'src/xmlpatterns/functions')
47 files changed, 208 insertions, 210 deletions
diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index 6a65308..7b634d5 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 b132d99..052d630 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 d1a09ef..cca1bd8 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 81e3a1e..2babae5 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 0624e5a..e5ab7ab 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 cefccfb..ffc0589 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 9dce6bb..1356cef 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 56691e0..2af617d 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 896d2f8..7228c8d 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 69aadad..00e3958 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 f3743b3..beaeff7 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 8af5544..cc1ad32 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 bc40200..986ec89 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 3cb0326..71ff121 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 a578883..1166d98 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 4be225e..d9750bd 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 1e2216d..435202b 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 5105c21..a4df73e 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 860055f..57da501 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 03068c5..474ed3e 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 2adbdc1..056b00b 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/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h index 14293e3..3f79a39 100644 --- a/src/xmlpatterns/functions/qfunctionsignature_p.h +++ b/src/xmlpatterns/functions/qfunctionsignature_p.h @@ -51,6 +51,7 @@ #define Patternist_FunctionSignature_H #include <QSharedData> +#include <qcontainerfwd.h> #include <private/qcalltargetdescription_p.h> #include <private/qexpression_p.h> @@ -60,9 +61,6 @@ QT_BEGIN_NAMESPACE -template<typename Key, typename Value> class QHash; -template<typename T> class QList; - namespace QPatternist { diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h index 5e4aa1e..8d37de0 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 cfb1faa..9469953 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 1f56d84..04f805d 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 f95bb42..cdf4322 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 462f016..54838ce 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 9264974..b2b9fcb 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 40271f5..a289c3d 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 82b430b..16a79a8 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 28c9134..9016911 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 30dab9f..83f2ee5 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 0599415..4367391 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 2f15b7f..88c515c 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 ed8bca9..7367632 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 d1fcb75..1e6b052 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 cc347f6..8312aa0 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 5c933ed..3c61fd2 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 2e5a31d..b423402 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 6dc57a4..8dd1987 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 206cb16..6029202 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 eaf51c6..74f73b9 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 eb4d049..6ca320c 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 aa807cb..5899598 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 8a6fcd8..9797229 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 2a78a7c..91d87f2 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 b0dc87c..e68e438 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; }; } |