diff options
242 files changed, 1522 insertions, 1560 deletions
diff --git a/.qmake.conf b/.qmake.conf index 96f7a81..a93cfcc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 0000000..3da704b --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,7 @@ +dependencies: + ../qtbase: + ref: 089d54f06ff327f5212cb08fdbcb540066357dd5 + required: true + ../qtdeclarative: + ref: 406f15ce0e2707452462ff73b2d660ece960623f + required: false diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp index c5356b8..7cf9759 100644 --- a/src/imports/xmllistmodel/plugin.cpp +++ b/src/imports/xmllistmodel/plugin.cpp @@ -57,8 +57,9 @@ public: qmlRegisterType<QQuickXmlListModel>(uri,2,0,"XmlListModel"); qmlRegisterType<QQuickXmlListModelRole>(uri,2,0,"XmlRole"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 2, 15); } }; diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index 0da7976..cc86965 100644 --- a/src/xmlpatterns/acceltree/qacceliterators_p.h +++ b/src/xmlpatterns/acceltree/qacceliterators_p.h @@ -66,8 +66,8 @@ namespace QPatternist class AccelIterator : public QXmlNodeModelIndex::Iterator { public: - virtual xsInteger position() const; - virtual QXmlNodeModelIndex current() const; + xsInteger position() const override; + QXmlNodeModelIndex current() const override; protected: inline AccelIterator(const AccelTree *const doc, @@ -124,7 +124,7 @@ namespace QPatternist Q_ASSERT(IncludeSelf || m_document->hasParent(pre)); } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return closedExit(); @@ -138,7 +138,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new AncestorIterator<IncludeSelf>(m_document, m_preNumber)); } @@ -176,8 +176,8 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; private: const AccelTree::Depth m_depth; @@ -202,7 +202,7 @@ namespace QPatternist "When being following-sibling, the context node cannot be the last node in the document."); } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return QXmlNodeModelIndex(); @@ -245,7 +245,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new SiblingIterator<IsFollowing>(m_document, m_preNumber)); } @@ -292,7 +292,7 @@ namespace QPatternist } } - virtual QXmlNodeModelIndex next() + QXmlNodeModelIndex next() override { if(m_currentPre == -1) return closedExit(); @@ -326,7 +326,7 @@ namespace QPatternist return m_current; } - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const + QXmlNodeModelIndex::Iterator::Ptr copy() const override { return QXmlNodeModelIndex::Iterator::Ptr(new DescendantIterator<IncludeSelf>(m_document, m_preNumber)); } @@ -351,8 +351,8 @@ namespace QPatternist { } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; }; /** @@ -373,8 +373,8 @@ namespace QPatternist { } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; private: const AccelTree::PreNumber m_postNumber; @@ -397,8 +397,8 @@ namespace QPatternist Q_ASSERT(m_document->kind(m_currentPre) == QXmlNodeModelIndex::Attribute); } - virtual QXmlNodeModelIndex next(); - virtual QXmlNodeModelIndex::Iterator::Ptr copy() const; + QXmlNodeModelIndex next() override; + QXmlNodeModelIndex::Iterator::Ptr copy() const override; }; } diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 23503fe..62c23ad 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -64,7 +64,7 @@ namespace QPatternist { { } - virtual QSourceLocation sourceLocation(const QXmlNodeModelIndex &index) const + QSourceLocation sourceLocation(const QXmlNodeModelIndex &index) const override { return m_accelTree->sourceLocation(index); } diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h index 91efd95..3a42657 100644 --- a/src/xmlpatterns/acceltree/qacceltree_p.h +++ b/src/xmlpatterns/acceltree/qacceltree_p.h @@ -215,11 +215,11 @@ namespace QPatternist QXmlNodeModelIndex::NodeKind m_kind : 8; }; - virtual QUrl baseUri(const QXmlNodeModelIndex &ni) const; - virtual QUrl documentUri(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, - const QXmlNodeModelIndex &ni2) const; + QUrl baseUri(const QXmlNodeModelIndex &ni) const override; + QUrl documentUri(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, + const QXmlNodeModelIndex &ni2) const override; /** * @short Returns the root node. @@ -227,24 +227,24 @@ namespace QPatternist * This function does not use @p n, so a default constructed * QXmlNodeModelIndex may be passed. */ - virtual QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const; + QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const override; virtual QXmlNodeModelIndex parent(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::Iterator::Ptr iterate(const QXmlNodeModelIndex &ni, - QXmlNodeModelIndex::Axis axis) const; - virtual QXmlName name(const QXmlNodeModelIndex &ni) const; - virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const; - virtual void sendNamespaces(const QXmlNodeModelIndex &n, - QAbstractXmlReceiver *const receiver) const; - virtual QString stringValue(const QXmlNodeModelIndex &n) const; - virtual QVariant typedValue(const QXmlNodeModelIndex &n) const; - virtual Item::Iterator::Ptr sequencedTypedValue(const QXmlNodeModelIndex &n) const; - virtual ItemType::Ptr type(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex elementById(const QXmlName &id) const; - virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const; - virtual void copyNodeTo(const QXmlNodeModelIndex &node, - QAbstractXmlReceiver *const receiver, - const NodeCopySettings &settings) const; + QXmlNodeModelIndex::Iterator::Ptr iterate(const QXmlNodeModelIndex &ni, + QXmlNodeModelIndex::Axis axis) const override; + QXmlName name(const QXmlNodeModelIndex &ni) const override; + QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const override; + void sendNamespaces(const QXmlNodeModelIndex &n, + QAbstractXmlReceiver *const receiver) const override; + QString stringValue(const QXmlNodeModelIndex &n) const override; + QVariant typedValue(const QXmlNodeModelIndex &n) const override; + Item::Iterator::Ptr sequencedTypedValue(const QXmlNodeModelIndex &n) const override; + ItemType::Ptr type(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex elementById(const QXmlName &id) const override; + QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const override; + void copyNodeTo(const QXmlNodeModelIndex &node, + QAbstractXmlReceiver *const receiver, + const NodeCopySettings &settings) const override; friend class AccelTreeBuilder<false>; friend class AccelTreeBuilder<true>; @@ -366,9 +366,9 @@ namespace QPatternist QUrl m_baseURI; protected: - virtual QXmlNodeModelIndex nextFromSimpleAxis(QAbstractXmlNodeModel::SimpleAxis, - const QXmlNodeModelIndex&) const; - virtual QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const; + QXmlNodeModelIndex nextFromSimpleAxis(QAbstractXmlNodeModel::SimpleAxis, + const QXmlNodeModelIndex&) const override; + QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const override; private: /** diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h index 4de9984..80fa8ec 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h +++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h @@ -103,34 +103,34 @@ namespace QPatternist const NamePool::Ptr &np, ReportContext *const context, Features features = NoneFeature); - virtual void startDocument(); - virtual void endDocument(); - virtual void startElement(const QXmlName &name); + void startDocument() override; + void endDocument() override; + void startElement(const QXmlName &name) override; void startElement(const QXmlName &name, qint64 line, qint64 column); - virtual void endElement(); - virtual void attribute(const QXmlName &name, const QStringRef &value); - virtual void characters(const QStringRef &ch); - virtual void whitespaceOnly(const QStringRef &ch); - virtual void processingInstruction(const QXmlName &target, - const QString &data); - virtual void namespaceBinding(const QXmlName &nb); - virtual void comment(const QString &content); - virtual void item(const Item &it); - - virtual QAbstractXmlNodeModel::Ptr builtDocument(); - virtual NodeBuilder::Ptr create(const QUrl &baseURI) const; - virtual void startOfSequence(); - virtual void endOfSequence(); + void endElement() override; + void attribute(const QXmlName &name, const QStringRef &value) override; + void characters(const QStringRef &ch) override; + void whitespaceOnly(const QStringRef &ch) override; + void processingInstruction(const QXmlName &target, + const QString &data) override; + void namespaceBinding(const QXmlName &nb) override; + void comment(const QString &content) override; + void item(const Item &it) override; + + QAbstractXmlNodeModel::Ptr builtDocument() override; + NodeBuilder::Ptr create(const QUrl &baseURI) const override; + void startOfSequence() override; + void endOfSequence() override; inline AccelTree::Ptr builtDocument() const { return m_document; } - virtual void atomicValue(const QVariant &value); + void atomicValue(const QVariant &value) override; - virtual const SourceLocationReflection *actualReflection() const; - virtual QSourceLocation sourceLocation() const; + const SourceLocationReflection *actualReflection() const override; + QSourceLocation sourceLocation() const override; private: inline void startStructure(); diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h index 616409f..f43e6cd 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h @@ -92,20 +92,20 @@ namespace QPatternist AccelTreeResourceLoader(const NamePool::Ptr &np, const NetworkAccessDelegator::Ptr &networkDelegator, AccelTreeBuilder<true>::Features = AccelTreeBuilder<true>::NoneFeature); - virtual Item openDocument(const QUrl &uri, - const ReportContext::Ptr &context); + Item openDocument(const QUrl &uri, + const ReportContext::Ptr &context) override; virtual Item openDocument(QIODevice *source, const QUrl &documentUri, const ReportContext::Ptr &context); - virtual SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint); - virtual bool isDocumentAvailable(const QUrl &uri); + SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint) override; + bool isDocumentAvailable(const QUrl &uri) override; - virtual bool isUnparsedTextAvailable(const QUrl &uri, - const QString &encoding); + bool isUnparsedTextAvailable(const QUrl &uri, + const QString &encoding) override; - virtual Item openUnparsedText(const QUrl &uri, - const QString &encoding, - const ReportContext::Ptr &context, - const SourceLocationReflection *const where); + Item openUnparsedText(const QUrl &uri, + const QString &encoding, + const ReportContext::Ptr &context, + const SourceLocationReflection *const where) override; /** * @short Helper function that do NetworkAccessDelegator::get(), but @@ -135,9 +135,9 @@ namespace QPatternist * @short Returns the URIs this AccelTreeResourceLoader has loaded * which are for devices through variable bindings. */ - virtual QSet<QUrl> deviceURIs() const; + QSet<QUrl> deviceURIs() const override; - virtual void clear(const QUrl &uri); + void clear(const QUrl &uri) override; private: static bool streamToReceiver(QIODevice *const dev, diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index 9071a8b..b033486 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -103,7 +103,7 @@ public: virtual qint64 position() const = 0; virtual typename QAbstractXmlForwardIterator<T>::Ptr toReversed(); - virtual QList<T> toList(); + virtual QVector<T> toVector(); virtual typename QAbstractXmlForwardIterator<T>::Ptr copy() const; virtual T last(); virtual bool isEmpty(); @@ -193,39 +193,14 @@ namespace QPatternist using ListIteratorPlatform<T, T, ListIterator<T, ListType>, ListType>::m_list; - static inline QVector<T> toVector(const QVector<T> &vector) - { - return vector; - } - - static inline QVector<T> toVector(const QList<T> &list) - { - return list.toVector(); - } - - static inline QList<T> toList(const QVector<T> &vector) - { - return vector.toList(); - } - - static inline QList<T> toList(const QList<T> &list) - { - return list; - } - public: inline ListIterator(const ListType &list) : ListIteratorPlatform<T, T, ListIterator<T, ListType>, ListType>(list) { } - QList<T> toList() override + QVector<T> toVector() override { - return toList(m_list); - } - - virtual QVector<T> toVector() - { - return toVector(m_list); + return m_list; } private: @@ -257,9 +232,9 @@ namespace QPatternist } template<typename T> -QList<T> QAbstractXmlForwardIterator<T>::toList() +QVector<T> QAbstractXmlForwardIterator<T>::toVector() { - QList<T> result; + QVector<T> result; T item(next()); while(!qIsForwardIteratorEnd(item)) diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 99bf2a0..3909f04 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -1016,7 +1016,7 @@ bool QAbstractXmlNodeModel::isDeepEqual(const QXmlNodeModelIndex &n1, QXmlNodeModelIndexIteratorPointer atts1(n1.iterate(QXmlNodeModelIndex::AxisAttribute)); QXmlNodeModelIndex node(atts1->next()); - const QXmlNodeModelIndex::List atts2(n2.iterate(QXmlNodeModelIndex::AxisAttribute)->toList()); + const QXmlNodeModelIndex::List atts2(n2.iterate(QXmlNodeModelIndex::AxisAttribute)->toVector()); const QXmlNodeModelIndex::List::const_iterator end(atts2.constEnd()); while(!node.isNull()) 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/qitem_p.h b/src/xmlpatterns/data/qitem_p.h index a395b5e..2fcb71e 100644 --- a/src/xmlpatterns/data/qitem_p.h +++ b/src/xmlpatterns/data/qitem_p.h @@ -57,6 +57,7 @@ #include <QUrl> #include <QVariant> +#include <qcontainerfwd.h> /** * @file @@ -72,8 +73,6 @@ QT_BEGIN_NAMESPACE -template<typename T> class QList; -template<typename T> class QVector; template<typename T> class QAbstractXmlForwardIterator; class QSourceLocation; 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; diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h index 5422259..a198045 100644 --- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h +++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h @@ -75,7 +75,7 @@ namespace QPatternist CurrentItemContext(const Item &item, const DynamicContext::Ptr &prevContext); - virtual Item currentItem() const; + Item currentItem() const override; private: const Item m_currentItem; diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h index 32d0506..21c44c9 100644 --- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h @@ -71,46 +71,46 @@ namespace QPatternist class DelegatingDynamicContext : public DynamicContext { public: - virtual xsInteger contextPosition() const; - virtual Item contextItem() const; - virtual xsInteger contextSize(); - - virtual ItemCacheCell &itemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot); - - virtual void setRangeVariable(const VariableSlotID slotNumber, - const Item &newValue); - virtual Item rangeVariable(const VariableSlotID slotNumber) const; - - virtual void setExpressionVariable(const VariableSlotID slotNumber, - const Expression::Ptr &newValue); - virtual Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const; - - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; - - virtual Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const; - virtual void setPositionIterator(const VariableSlotID slot, - const Item::Iterator::Ptr &newValue); - - virtual QAbstractMessageHandler * messageHandler() const; - virtual QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const; - virtual QDateTime currentDateTime() const; - virtual QAbstractXmlReceiver *outputReceiver() const; - virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const; - virtual ResourceLoader::Ptr resourceLoader() const; - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; - virtual NamePool::Ptr namePool() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm); - virtual const QAbstractUriResolver *uriResolver() const; - virtual ItemCacheCell &globalItemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot); - virtual Item currentItem() const; - virtual TemplateParameterHash &templateParameterStore(); - - virtual DynamicContext::Ptr previousContext() const; - virtual QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const; + xsInteger contextPosition() const override; + Item contextItem() const override; + xsInteger contextSize() override; + + ItemCacheCell &itemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot) override; + + void setRangeVariable(const VariableSlotID slotNumber, + const Item &newValue) override; + Item rangeVariable(const VariableSlotID slotNumber) const override; + + void setExpressionVariable(const VariableSlotID slotNumber, + const Expression::Ptr &newValue) override; + Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const override; + + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; + + Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const override; + void setPositionIterator(const VariableSlotID slot, + const Item::Iterator::Ptr &newValue) override; + + QAbstractMessageHandler * messageHandler() const override; + QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const override; + QDateTime currentDateTime() const override; + QAbstractXmlReceiver *outputReceiver() const override; + NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const override; + ResourceLoader::Ptr resourceLoader() const override; + ExternalVariableLoader::Ptr externalVariableLoader() const override; + NamePool::Ptr namePool() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm) override; + const QAbstractUriResolver *uriResolver() const override; + ItemCacheCell &globalItemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot) override; + Item currentItem() const override; + TemplateParameterHash &templateParameterStore() override; + + DynamicContext::Ptr previousContext() const override; + QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const override; protected: DelegatingDynamicContext(const DynamicContext::Ptr &prevContext); diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h index 35fe7fe..98dddfd 100644 --- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h @@ -69,64 +69,64 @@ namespace QPatternist class Q_AUTOTEST_EXPORT DelegatingStaticContext : public StaticContext { public: - virtual NamespaceResolver::Ptr namespaceBindings() const; - virtual void setNamespaceBindings(const NamespaceResolver::Ptr &); + NamespaceResolver::Ptr namespaceBindings() const override; + void setNamespaceBindings(const NamespaceResolver::Ptr &) override; - virtual FunctionFactory::Ptr functionSignatures() const; - virtual SchemaTypeFactory::Ptr schemaDefinitions() const; - virtual DynamicContext::Ptr dynamicContext() const; + FunctionFactory::Ptr functionSignatures() const override; + SchemaTypeFactory::Ptr schemaDefinitions() const override; + DynamicContext::Ptr dynamicContext() const override; - virtual QUrl baseURI() const; - virtual void setBaseURI(const QUrl &uri); + QUrl baseURI() const override; + void setBaseURI(const QUrl &uri) override; - virtual bool compatModeEnabled() const; - virtual void setCompatModeEnabled(const bool newVal); + bool compatModeEnabled() const override; + void setCompatModeEnabled(const bool newVal) override; - virtual QUrl defaultCollation() const; + QUrl defaultCollation() const override; - virtual QAbstractMessageHandler * messageHandler() const; + QAbstractMessageHandler * messageHandler() const override; - virtual void setDefaultCollation(const QUrl &uri); + void setDefaultCollation(const QUrl &uri) override; - virtual BoundarySpacePolicy boundarySpacePolicy() const; - virtual void setBoundarySpacePolicy(const BoundarySpacePolicy policy); + BoundarySpacePolicy boundarySpacePolicy() const override; + void setBoundarySpacePolicy(const BoundarySpacePolicy policy) override; - virtual ConstructionMode constructionMode() const; - virtual void setConstructionMode(const ConstructionMode mode); + ConstructionMode constructionMode() const override; + void setConstructionMode(const ConstructionMode mode) override; - virtual OrderingMode orderingMode() const; - virtual void setOrderingMode(const OrderingMode mode); - virtual OrderingEmptySequence orderingEmptySequence() const; - virtual void setOrderingEmptySequence(const OrderingEmptySequence ordering); + OrderingMode orderingMode() const override; + void setOrderingMode(const OrderingMode mode) override; + OrderingEmptySequence orderingEmptySequence() const override; + void setOrderingEmptySequence(const OrderingEmptySequence ordering) override; - virtual QString defaultFunctionNamespace() const; - virtual void setDefaultFunctionNamespace(const QString &ns); + QString defaultFunctionNamespace() const override; + void setDefaultFunctionNamespace(const QString &ns) override; - virtual QString defaultElementNamespace() const; - virtual void setDefaultElementNamespace(const QString &ns); + QString defaultElementNamespace() const override; + void setDefaultElementNamespace(const QString &ns) override; - virtual InheritMode inheritMode() const; - virtual void setInheritMode(const InheritMode mode); + InheritMode inheritMode() const override; + void setInheritMode(const InheritMode mode) override; - virtual PreserveMode preserveMode() const; - virtual void setPreserveMode(const PreserveMode mode); + PreserveMode preserveMode() const override; + void setPreserveMode(const PreserveMode mode) override; - virtual ItemType::Ptr contextItemType() const; - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr contextItemType() const override; + ItemType::Ptr currentItemType() const override; - virtual StaticContext::Ptr copy() const; + StaticContext::Ptr copy() const override; - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; - virtual ResourceLoader::Ptr resourceLoader() const; - virtual NamePool::Ptr namePool() const; - virtual void addLocation(const SourceLocationReflection *const reflection, - const QSourceLocation &location); - virtual LocationHash sourceLocations() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual const QAbstractUriResolver *uriResolver() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; + ResourceLoader::Ptr resourceLoader() const override; + NamePool::Ptr namePool() const override; + void addLocation(const SourceLocationReflection *const reflection, + const QSourceLocation &location) override; + LocationHash sourceLocations() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + const QAbstractUriResolver *uriResolver() const override; - virtual VariableSlotID currentRangeSlot() const; - virtual VariableSlotID allocateRangeSlot(); + VariableSlotID currentRangeSlot() const override; + VariableSlotID allocateRangeSlot() override; protected: DelegatingStaticContext(const StaticContext::Ptr &context); diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h index 11ded99..edd8b36 100644 --- a/src/xmlpatterns/environment/qdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdynamiccontext_p.h @@ -137,7 +137,7 @@ namespace QPatternist virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const = 0; virtual ResourceLoader::Ptr resourceLoader() const = 0; virtual ExternalVariableLoader::Ptr externalVariableLoader() const = 0; - virtual NamePool::Ptr namePool() const = 0; + NamePool::Ptr namePool() const override = 0; /** * @short Returns the item that @c fn:current() returns. diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h index c37f1bf..945b418 100644 --- a/src/xmlpatterns/environment/qfocus_p.h +++ b/src/xmlpatterns/environment/qfocus_p.h @@ -73,18 +73,18 @@ namespace QPatternist public: Focus(const DynamicContext::Ptr &prevContext); - virtual xsInteger contextPosition() const; - virtual Item contextItem() const; - virtual xsInteger contextSize(); + xsInteger contextPosition() const override; + Item contextItem() const override; + xsInteger contextSize() override; - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; /** * If there is no top level expression that sets the current item, * the focus should be used. This implementation ensures that. */ - virtual Item currentItem() const; + Item currentItem() const override; private: Item::Iterator::Ptr m_focusIterator; diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h index bff7c92..820b077 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h @@ -79,53 +79,53 @@ namespace QPatternist QAbstractMessageHandler *const messageHandler, const LocationHash &locations); - virtual xsInteger contextPosition() const; + xsInteger contextPosition() const override; /** * @returns always @c null, the focus is always undefined when an GenericDynamicContext * is used. */ - virtual Item contextItem() const; - virtual xsInteger contextSize(); + Item contextItem() const override; + xsInteger contextSize() override; - virtual void setFocusIterator(const Item::Iterator::Ptr &it); - virtual Item::Iterator::Ptr focusIterator() const; + void setFocusIterator(const Item::Iterator::Ptr &it) override; + Item::Iterator::Ptr focusIterator() const override; - virtual QAbstractMessageHandler * messageHandler() const; - virtual QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const; - virtual QDateTime currentDateTime() const; + QAbstractMessageHandler * messageHandler() const override; + QExplicitlySharedDataPointer<DayTimeDuration> implicitTimezone() const override; + QDateTime currentDateTime() const override; - virtual QAbstractXmlReceiver *outputReceiver() const; + QAbstractXmlReceiver *outputReceiver() const override; void setOutputReceiver(QAbstractXmlReceiver *const receiver); - virtual NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const; + NodeBuilder::Ptr nodeBuilder(const QUrl &baseURI) const override; void setNodeBuilder(NodeBuilder::Ptr &builder); - virtual ResourceLoader::Ptr resourceLoader() const; + ResourceLoader::Ptr resourceLoader() const override; void setResourceLoader(const ResourceLoader::Ptr &loader); - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; void setExternalVariableLoader(const ExternalVariableLoader::Ptr &loader); - virtual NamePool::Ptr namePool() const; - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; - virtual void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm); - virtual const QAbstractUriResolver *uriResolver() const; - virtual ItemCacheCell &globalItemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot); + NamePool::Ptr namePool() const override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; + void addNodeModel(const QAbstractXmlNodeModel::Ptr &nm) override; + const QAbstractUriResolver *uriResolver() const override; + ItemCacheCell &globalItemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &globalItemSequenceCacheCells(const VariableSlotID slot) override; void setUriResolver(const QAbstractUriResolver *const resolver); /** * We return a null item, we have no focus. */ - virtual Item currentItem() const; + Item currentItem() const override; /** * @short Returns always @c null, since we're always * a top-level context. */ - virtual DynamicContext::Ptr previousContext() const; + DynamicContext::Ptr previousContext() const override; - virtual QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const; + QExplicitlySharedDataPointer<TemplateMode> currentTemplateMode() const override; private: QAbstractMessageHandler * m_messageHandler; diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h index b80b3e3..cc219e3 100644 --- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h +++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h @@ -88,79 +88,79 @@ namespace QPatternist const FunctionFactory::Ptr &factory, const QXmlQuery::QueryLanguage lang); - virtual NamespaceResolver::Ptr namespaceBindings() const; - virtual void setNamespaceBindings(const NamespaceResolver::Ptr &); + NamespaceResolver::Ptr namespaceBindings() const override; + void setNamespaceBindings(const NamespaceResolver::Ptr &) override; - virtual FunctionFactory::Ptr functionSignatures() const; - virtual SchemaTypeFactory::Ptr schemaDefinitions() const; + FunctionFactory::Ptr functionSignatures() const override; + SchemaTypeFactory::Ptr schemaDefinitions() const override; /** * Returns a DynamicContext used for evaluation at compile time. * * @bug The DynamicContext isn't stable. It should be cached privately. */ - virtual DynamicContext::Ptr dynamicContext() const; + DynamicContext::Ptr dynamicContext() const override; - virtual QUrl baseURI() const; - virtual void setBaseURI(const QUrl &uri); + QUrl baseURI() const override; + void setBaseURI(const QUrl &uri) override; - virtual bool compatModeEnabled() const; - virtual void setCompatModeEnabled(const bool newVal); + bool compatModeEnabled() const override; + void setCompatModeEnabled(const bool newVal) override; /** * @returns always the Unicode codepoint collation URI */ - virtual QUrl defaultCollation() const; + QUrl defaultCollation() const override; - virtual QAbstractMessageHandler * messageHandler() const; + QAbstractMessageHandler * messageHandler() const override; - virtual void setDefaultCollation(const QUrl &uri); + void setDefaultCollation(const QUrl &uri) override; - virtual BoundarySpacePolicy boundarySpacePolicy() const; - virtual void setBoundarySpacePolicy(const BoundarySpacePolicy policy); + BoundarySpacePolicy boundarySpacePolicy() const override; + void setBoundarySpacePolicy(const BoundarySpacePolicy policy) override; - virtual ConstructionMode constructionMode() const; - virtual void setConstructionMode(const ConstructionMode mode); + ConstructionMode constructionMode() const override; + void setConstructionMode(const ConstructionMode mode) override; - virtual OrderingMode orderingMode() const; - virtual void setOrderingMode(const OrderingMode mode); - virtual OrderingEmptySequence orderingEmptySequence() const; - virtual void setOrderingEmptySequence(const OrderingEmptySequence ordering); + OrderingMode orderingMode() const override; + void setOrderingMode(const OrderingMode mode) override; + OrderingEmptySequence orderingEmptySequence() const override; + void setOrderingEmptySequence(const OrderingEmptySequence ordering) override; - virtual QString defaultFunctionNamespace() const; - virtual void setDefaultFunctionNamespace(const QString &ns); + QString defaultFunctionNamespace() const override; + void setDefaultFunctionNamespace(const QString &ns) override; - virtual QString defaultElementNamespace() const; - virtual void setDefaultElementNamespace(const QString &ns); + QString defaultElementNamespace() const override; + void setDefaultElementNamespace(const QString &ns) override; - virtual InheritMode inheritMode() const; - virtual void setInheritMode(const InheritMode mode); + InheritMode inheritMode() const override; + void setInheritMode(const InheritMode mode) override; - virtual PreserveMode preserveMode() const; - virtual void setPreserveMode(const PreserveMode mode); + PreserveMode preserveMode() const override; + void setPreserveMode(const PreserveMode mode) override; - virtual ItemType::Ptr contextItemType() const; + ItemType::Ptr contextItemType() const override; void setContextItemType(const ItemType::Ptr &type); - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr currentItemType() const override; - virtual StaticContext::Ptr copy() const; + StaticContext::Ptr copy() const override; - virtual ResourceLoader::Ptr resourceLoader() const; + ResourceLoader::Ptr resourceLoader() const override; void setResourceLoader(const ResourceLoader::Ptr &loader); - virtual ExternalVariableLoader::Ptr externalVariableLoader() const; + ExternalVariableLoader::Ptr externalVariableLoader() const override; void setExternalVariableLoader(const ExternalVariableLoader::Ptr &loader); - virtual NamePool::Ptr namePool() const; + NamePool::Ptr namePool() const override; - virtual void addLocation(const SourceLocationReflection *const reflection, - const QSourceLocation &location); - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; + void addLocation(const SourceLocationReflection *const reflection, + const QSourceLocation &location) override; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; - virtual LocationHash sourceLocations() const; - virtual QAbstractUriResolver *uriResolver() const; + LocationHash sourceLocations() const override; + QAbstractUriResolver *uriResolver() const override; - virtual VariableSlotID currentRangeSlot() const; - virtual VariableSlotID allocateRangeSlot(); + VariableSlotID currentRangeSlot() const override; + VariableSlotID allocateRangeSlot() override; private: BoundarySpacePolicy m_boundarySpacePolicy; diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h index 96374b8..cdf7c46 100644 --- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist ReceiverDynamicContext(const DynamicContext::Ptr &prevContext, QAbstractXmlReceiver *const receiver); - virtual QAbstractXmlReceiver *outputReceiver() const; + QAbstractXmlReceiver *outputReceiver() const override; private: QAbstractXmlReceiver *const m_receiver; diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h index 3603dc9..98abbd1 100644 --- a/src/xmlpatterns/environment/qstackcontextbase_p.h +++ b/src/xmlpatterns/environment/qstackcontextbase_p.h @@ -79,21 +79,21 @@ namespace QPatternist */ StackContextBase(const DynamicContext::Ptr &prevContext); - virtual void setRangeVariable(const VariableSlotID slotNumber, - const Item &newValue); - virtual Item rangeVariable(const VariableSlotID slotNumber) const; + void setRangeVariable(const VariableSlotID slotNumber, + const Item &newValue) override; + Item rangeVariable(const VariableSlotID slotNumber) const override; - virtual void setExpressionVariable(const VariableSlotID slotNumber, - const Expression::Ptr &newValue); - virtual Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const; + void setExpressionVariable(const VariableSlotID slotNumber, + const Expression::Ptr &newValue) override; + Expression::Ptr expressionVariable(const VariableSlotID slotNumber) const override; - virtual Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const; - virtual void setPositionIterator(const VariableSlotID slot, - const Item::Iterator::Ptr &newValue); - virtual ItemCacheCell &itemCacheCell(const VariableSlotID slot); - virtual ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot); + Item::Iterator::Ptr positionIterator(const VariableSlotID slot) const override; + void setPositionIterator(const VariableSlotID slot, + const Item::Iterator::Ptr &newValue) override; + ItemCacheCell &itemCacheCell(const VariableSlotID slot) override; + ItemSequenceCacheCell::Vector &itemSequenceCacheCells(const VariableSlotID slot) override; - virtual DynamicContext::TemplateParameterHash &templateParameterStore(); + DynamicContext::TemplateParameterHash &templateParameterStore() override; protected: /** diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h index 1097c18..01b7d7b 100644 --- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h +++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h @@ -73,7 +73,7 @@ namespace QPatternist StaticBaseURIContext(const QUrl &bURI, const StaticContext::Ptr &prevContext); - virtual QUrl baseURI() const; + QUrl baseURI() const override; private: const QUrl m_baseURI; diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h index 46b8a8a..be61412 100644 --- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h +++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist /** * Returns always @c true. */ - virtual bool compatModeEnabled() const; + bool compatModeEnabled() const override; }; } diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h index ba9e0f6..b1506a8 100644 --- a/src/xmlpatterns/environment/qstaticcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcontext_p.h @@ -256,7 +256,7 @@ namespace QPatternist virtual ExternalVariableLoader::Ptr externalVariableLoader() const = 0; virtual ResourceLoader::Ptr resourceLoader() const = 0; - virtual NamePool::Ptr namePool() const = 0; + NamePool::Ptr namePool() const override = 0; /** * @short Adds @p location for @p reflection. diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h index 5e45483..fcea6f3 100644 --- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h @@ -72,7 +72,7 @@ namespace QPatternist /** * @returns the type passed in the constructor. */ - virtual ItemType::Ptr currentItemType() const; + ItemType::Ptr currentItemType() const override; private: const ItemType::Ptr m_currentItemType; diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h index ea62624..fc8f4fe 100644 --- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h +++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h @@ -73,7 +73,7 @@ namespace QPatternist /** * @returns the type passed in the constructor. */ - virtual ItemType::Ptr contextItemType() const; + ItemType::Ptr contextItemType() const override; private: const ItemType::Ptr m_contextItemType; diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h index 3ad3274..7b98831 100644 --- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h +++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h @@ -71,7 +71,7 @@ namespace QPatternist /** * @returns the resolver passed in the constructor. */ - virtual NamespaceResolver::Ptr namespaceBindings() const; + NamespaceResolver::Ptr namespaceBindings() const override; private: const NamespaceResolver::Ptr m_namespaceBindings; diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index 6dd0304..27f45b6 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -73,17 +73,17 @@ namespace QPatternist AndExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index 63d81c4..8f7cb00 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -90,11 +90,11 @@ namespace QPatternist const WithParam::Hash &withParams, const TemplateMode::Ptr &defaultMode); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * The only reason this function exists, is in order to convert @@ -108,11 +108,11 @@ namespace QPatternist inline TemplateMode::Ptr mode() const; - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; - Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: typedef QExplicitlySharedDataPointer<const ApplyTemplate> ConstPtr; diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index 3705f73..f2ffafb 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -71,12 +71,12 @@ namespace QPatternist ArgumentReference(const SequenceType::Ptr &sourceType, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: const SequenceType::Ptr m_type; diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp index f21dbcb..a810041 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression.cpp +++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp @@ -98,7 +98,7 @@ public: { } - virtual const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return m_reflection; } diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index e09635b..f2201f7 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -78,14 +78,14 @@ namespace QPatternist const AtomicMathematician::Operator op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; AtomicMathematician::Operator operatorID() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; static Item flexiblyCalculate(const Item &op1, const AtomicMathematician::Operator op, @@ -105,7 +105,7 @@ namespace QPatternist const SourceLocationReflection *const reflection, const ReportContext::ErrorCode code = ReportContext::XPTY0004, const bool isCompat = false); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; protected: diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index 317d2be..598f5e1 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -71,25 +71,25 @@ namespace QPatternist AttributeConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDAttributeConstructor. */ - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: static inline QString processValue(const QXmlName name, diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index c61d43b..8a66b2a 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -73,18 +73,18 @@ namespace QPatternist public: AttributeNameValidator(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of its operand. This is returned as opposed * CommonSequenceTypes::ExactlyOneQName, since the operand might return a subtype * of @c xs:QName. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 30aa630..68d62e2 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -70,8 +70,8 @@ namespace QPatternist AxisStep(const QXmlNodeModelIndex::Axis axis, const ItemType::Ptr &nodeTest); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Returns @p node if it matches the node test this step is using, otherwise @c null. @@ -79,23 +79,23 @@ namespace QPatternist inline Item mapToItem(const QXmlNodeModelIndex &node, const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Rewrites to ParentNodeAxis, if possible. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the axis this step is using. @@ -124,8 +124,8 @@ namespace QPatternist */ static QString axisName(const QXmlNodeModelIndex::Axis axis); - virtual ID id() const; - virtual PatternPriority patternPriority() const; + ID id() const override; + PatternPriority patternPriority() const override; inline void setAxis(const QXmlNodeModelIndex::Axis newAxis); diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h index 4cc0f74..f72670f 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription_p.h +++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h @@ -51,14 +51,12 @@ #define Patternist_CallTargetDescription_H #include <QSharedData> +#include <qcontainerfwd.h> #include <private/qexpression_p.h> QT_BEGIN_NAMESPACE -template<typename Key, typename Value> class QHash; -template<typename T> class QList; - namespace QPatternist { class CallSite; diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index 136b8da..17ec7c5 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -73,14 +73,14 @@ namespace QPatternist CallTemplate(const QXmlName &name, const WithParam::Hash &withParams); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Properties dependencies() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Properties dependencies() const override; /** * This is a bit complicated by that we have two required types, one @@ -91,8 +91,8 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline void setTemplate(const Template::Ptr &templ) @@ -100,9 +100,9 @@ namespace QPatternist m_template = templ; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual Expression::Ptr body() const; - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + Expression::Ptr body() const override; + CallTargetDescription::Ptr callTargetDescription() const override; private: Template::Ptr m_template; }; diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index eff5618..3412be2 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -73,7 +73,7 @@ namespace QPatternist CastableAs(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; /** * Overridden to const fold to @c true when the target type @@ -81,14 +81,14 @@ namespace QPatternist * the type identical to the target type, <tt>xs:string</tt>, * and <tt>xs:untypedAtomic</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index 3aeeef2..66fcf43 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -91,9 +91,9 @@ namespace QPatternist CastAs(const Expression::Ptr &source, const SequenceType::Ptr &targetType); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the ItemType is this CastAs's @@ -101,21 +101,21 @@ namespace QPatternist * source operand to reflect whether this CastAs always will evaluate to * exactly-one or zero-or-one values. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Overridden in order to check that casting to an abstract type * is not attempted. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * If the target type is the same as the source type, it is rewritten * to the operand. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline ItemType::Ptr targetType() const { diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index ed04d43..15431e4 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -72,19 +72,19 @@ namespace QPatternist public: CollationChecker(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Expects exactly one string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns its operand's static type. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index 8499135..a56621b 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -79,16 +79,16 @@ namespace QPatternist const Operator op, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; Operator operatorID() const; - virtual ID id() const; + ID id() const override; /** * Determines the string representation for operator @p op. @@ -98,7 +98,7 @@ namespace QPatternist */ static QString displayName(const Operator op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const Operator m_operator; diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index 6190a8d..4e7312d 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: CommentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QString evaluateContent(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index fa19bec..6d5c1dc 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -70,12 +70,12 @@ namespace QPatternist ComputedNamespaceConstructor(const Expression::Ptr &prefix, const Expression::Ptr &namespaceURI); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -84,10 +84,10 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 6c48e72..a59837c 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -77,39 +77,39 @@ namespace QPatternist { } - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination and RequiresContextItem */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * Overridden to store a pointer to StaticContext::contextItemType(). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always IDContextItem */ - virtual ID id() const; + ID id() const override; /** * @returns always BuiltinTypes::item; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; - virtual const SourceLocationReflection *actualReflection() const; - virtual void announceFocusType(const ItemType::Ptr &type); + const SourceLocationReflection *actualReflection() const override; + void announceFocusType(const ItemType::Ptr &type) override; private: ItemType::Ptr m_itemType; diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index d481f67..d8148d2 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -79,28 +79,28 @@ namespace QPatternist const bool inheritNSS, const bool preserveNSS); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &source, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Properties properties() const; - virtual ItemType::Ptr expectedContextItemType() const; + Properties properties() const override; + ItemType::Ptr expectedContextItemType() const override; private: typedef QExplicitlySharedDataPointer<const CopyOf> ConstPtr; diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index 63bfb4e..7ef9a54 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -69,23 +69,23 @@ namespace QPatternist public: CurrentItemStore(const Expression::Ptr &operand); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; + Properties properties() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: static inline StaticContext::Ptr newStaticContext(const StaticContext::Ptr &context); diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index e3df493..04cad26 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -72,20 +72,20 @@ namespace QPatternist public: DocumentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual Properties properties() const; - virtual SequenceType::Ptr staticType() const; + Properties properties() const override; + SequenceType::Ptr staticType() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index d5fd1dd..17575c1 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -76,27 +76,27 @@ namespace QPatternist const DynamicContext::Ptr &context, const Expression::ConstPtr &expr); - virtual void namespaceBinding(const QXmlName &nb); - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void namespaceBinding(const QXmlName &nb) override; + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); - virtual void atomicValue(const QVariant &value); - virtual void startOfSequence(); - virtual void endOfSequence(); + void startDocument() override; + void endDocument() override; + void atomicValue(const QVariant &value) override; + void startOfSequence() override; + void endOfSequence() override; private: QAbstractXmlReceiver *const m_receiver; diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index 66080ca..3845143 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -69,17 +69,17 @@ namespace QPatternist DynamicContextStore(const Expression::Ptr &operand, const DynamicContext::Ptr &context); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the staticType() of its operand. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: DynamicContext *m_context; diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index 00492d7..ac63f9d 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -74,21 +74,21 @@ namespace QPatternist const Expression::Ptr &operand2, const bool isXSLT); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:QName, and the second * argument can be zero or more items. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Properties properties() const override; private: QUrl m_staticBaseURI; diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index 5a8c824..18cc0cb 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -68,24 +68,24 @@ namespace QPatternist /** * @returns always an empty list. */ - virtual Expression::List operands() const; + Expression::List operands() const override; /** * Does nothing, since sub-classes has no operands. Calling * it makes hence no sense, and it also results in an assert crash. */ - virtual void setOperands(const Expression::List &); + void setOperands(const Expression::List &) override; protected: /** * @returns always @c true */ - virtual bool compressOperands(const StaticContext::Ptr &context); + bool compressOperands(const StaticContext::Ptr &context) override; /** * @returns always an empty list since it has no operands. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; }; } diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index e487d3f..8a9a61d 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -92,22 +92,22 @@ namespace QPatternist /** * @returns always an empty iterator, an instance of EmptyIterator. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * @returns always @c null. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * Does nothing. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const override; /** * @returns always @c false. */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::Empty @@ -117,11 +117,11 @@ namespace QPatternist /** * @returns always CommonSequenceTypes::Empty */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index d3ac422..c0e7b45 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -96,22 +96,22 @@ namespace QPatternist const VariableDeclaration::Ptr &varDecl, const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual const SourceLocationReflection *actualReflection() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + const SourceLocationReflection *actualReflection() const override; inline VariableSlotID slot() const { diff --git a/src/xmlpatterns/expr/qexpression.cpp b/src/xmlpatterns/expr/qexpression.cpp index 3db1e4f..c7ecaea 100644 --- a/src/xmlpatterns/expr/qexpression.cpp +++ b/src/xmlpatterns/expr/qexpression.cpp @@ -86,9 +86,9 @@ void Expression::typeCheckOperands(const StaticContext::Ptr &context) /* If we create a focus, we handle the last one specially, so avoid it in the loop. */ const bool createsFocus = has(CreatesFocusForLast); - const SequenceType::List::const_iterator typeEnd(createsFocus ? --opTypes.constEnd() + const SequenceType::List::const_iterator typeEnd(createsFocus ? (opTypes.constEnd() - 1) : opTypes.constEnd()); - const Expression::List::const_iterator end(createsFocus ? --ops.constEnd() + const Expression::List::const_iterator end(createsFocus ? (ops.constEnd() - 1) : ops.constEnd()); SequenceType::List::const_iterator reqType(opTypes.constBegin()); diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 3e15343..8063040 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -52,6 +52,7 @@ #include <QFlags> #include <QSharedData> +#include <qcontainerfwd.h> #include <private/qcppcastinghelper_p.h> #include <private/qxmldebug_p.h> @@ -64,9 +65,6 @@ QT_BEGIN_NAMESPACE -template<typename T> class QList; -template<typename T> class QVector; - namespace QPatternist { template<typename T, typename ListType> class ListIterator; @@ -759,12 +757,12 @@ namespace QPatternist /** * @short Returns @c this. */ - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; /** * Reimplementation of SourceLocationReflection::description(). */ - virtual QString description() const; + QString description() const override; /** * When this function is called, it signals that the parent will create diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 0818e90..d860296 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -77,15 +77,15 @@ namespace QPatternist */ ExpressionSequence(const Expression::List &operands); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * Forwards the call to its children. */ - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; /** * Removes any empty sequences, typically "()", from its list of children. If @@ -96,21 +96,21 @@ namespace QPatternist * optimizations have rewritten themselves into empty sequences. Thus, * saving memory consumption and runtime overhead. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline Item::Iterator::Ptr mapToSequence(const Expression::Ptr &, const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns Expression::DisableElimination, plus the union * of all this ExpressionSequence's children's properties. If any child * does not have IsEvaluated, it is removed from the result. */ - virtual Expression::Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: typedef QExplicitlySharedDataPointer<const ExpressionSequence> ConstPtr; }; diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index ed4047b..55cb042 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -75,15 +75,15 @@ namespace QPatternist ExpressionVariableReference(const VariableSlotID slot, const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual ID id() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + ID id() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index 09c61e8..06a759b 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -73,18 +73,18 @@ namespace QPatternist ExternalVariableReference(const QXmlName &name, const SequenceType::Ptr &type); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QXmlName m_name; diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index efdca74..0417433 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -76,30 +76,30 @@ namespace QPatternist /** * @returns the first item, if any, from evaluating the source expression. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns a SequenceType where the item type is the same as the source expression * and where the cardinality is either Cardinality::zeroOrOne() or Cardinality::exactlyOne(), * depending on the source expression. */ - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Rewrites <tt>expression[1][1]</tt> into <tt>expression[1]</tt>. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns always IDFirstItemPredicate. */ - virtual ID id() const; + ID id() const override; }; } diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index 31ea033..a7369f9 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -76,27 +76,27 @@ namespace QPatternist const Expression::Ptr &returnExpression, const VariableSlotID positionSlot); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; - virtual ID id() const; + ID id() const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; /** * Sets m_allowsMany properly. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: inline void riggPositionalVariable(const DynamicContext::Ptr &context, diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index b3fffca..fcd8642 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -82,21 +82,21 @@ namespace QPatternist const bool isBackwardsCompat = false); ~GeneralComparison(); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + bool evaluateEBV(const DynamicContext::Ptr &) const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDGeneralComparison */ - virtual ID id() const; + ID id() const override; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * @returns the operator that this GeneralComparison is using. @@ -109,7 +109,7 @@ namespace QPatternist /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; private: static inline void updateType(ItemType::Ptr &type, diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index 37ffeb3..a5a7825 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -92,28 +92,28 @@ namespace QPatternist * its QAbstractXmlForwardIterator::next() calls, and since the Focus references the same QAbstractXmlForwardIterator, * the focus is automatically moved. */ - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; /** * Doesn't return the first item from calling evaluateSequence(), but does the mapping * manually. This avoid allocating an ItemMappingIterator. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; inline Item mapToItem(const Item &subject, const DynamicContext::Ptr &) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; /** * @returns always CreatesFocusForLast. */ - virtual Properties properties() const; + Properties properties() const override; - virtual QString description() const; + QString description() const override; protected: @@ -130,7 +130,7 @@ namespace QPatternist /** * @returns the ItemType of the first operand's staticType(). */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; private: typedef QExplicitlySharedDataPointer<const GenericPredicate> ConstPtr; diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index d26ccb0..8cb1d78 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -71,22 +71,22 @@ namespace QPatternist const Expression::Ptr &then, const Expression::Ptr &el); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns IDIfThenClause */ - virtual ID id() const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; - //virtual Properties properties() const; + ID id() const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; + //Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 519e8d2..13e098d 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -72,12 +72,12 @@ namespace QPatternist InstanceOf(const Expression::Ptr &operand, const SequenceType::Ptr &targetType); - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns the SequenceType that this <tt>instance of</tt> Expression diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index f2c8ccf..23ae209 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -78,18 +78,18 @@ namespace QPatternist const Expression::Ptr &operand2, const VariableDeclaration::Ptr &decl); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual Properties properties() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + Properties properties() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; private: inline DynamicContext::Ptr bindVariable(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 7a16e8d..556b662 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -77,19 +77,19 @@ namespace QPatternist */ Literal(const Item &item); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; - virtual QString description() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; + QString description() const override; /** * @returns Expression::DisableElimination and Expression::IsEvaluated */ - virtual Properties properties() const; + Properties properties() const override; /** * Declaring the return value of this function a const reference, leads diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index 0a4bde1..b9ad129 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -79,14 +79,14 @@ namespace QPatternist */ LiteralSequence(const Item::List &list); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual ID id() const; + ID id() const override; - virtual Properties properties() const; + Properties properties() const override; private: const Item::List m_list; diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index 78aceaf..5a89013 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -69,12 +69,12 @@ namespace QPatternist NamespaceConstructor(const QXmlName nb); ~NamespaceConstructor(); - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; /** * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * The static type is exactly one attribute node. It's unclear what @@ -83,17 +83,17 @@ namespace QPatternist * conceptually correct, since a namespace node isn't an attribute * node. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Expression::Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Expression::Properties properties() const override; inline const QXmlName &namespaceBinding() const { return m_binding; } - virtual ID id() const; + ID id() const override; private: const QXmlName m_binding; }; diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index dc09003..20e130d 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -75,16 +75,16 @@ namespace QPatternist NCNameConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Validates @p lexicalNCName as a processing instruction's target diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 48696e2..37d9c92 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -72,24 +72,24 @@ namespace QPatternist const QXmlNodeModelIndex::DocumentOrder op, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + bool evaluateEBV(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; virtual QXmlNodeModelIndex::DocumentOrder operatorID() const; /** * If any operator is the empty sequence, the NodeComparison rewrites * into that, since the empty sequence is always the result in that case. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns either CommonSequenceTypes::ZeroOrOneBoolean or * CommonSequenceTypes::ExactlyOneBoolean depending on the static * cardinality of its operands. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Determines the string representation for a node comparison operator. @@ -101,7 +101,7 @@ namespace QPatternist */ static QString displayName(const QXmlNodeModelIndex::DocumentOrder op); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: enum Result { diff --git a/src/xmlpatterns/expr/qnodesort.cpp b/src/xmlpatterns/expr/qnodesort.cpp index 5a384d6..da0513a 100644 --- a/src/xmlpatterns/expr/qnodesort.cpp +++ b/src/xmlpatterns/expr/qnodesort.cpp @@ -75,7 +75,7 @@ Item::Iterator::Ptr NodeSortExpression::evaluateSequence(const DynamicContext::P Q_ASSERT_X(m_operand->staticType()->cardinality().allowsMany(), Q_FUNC_INFO, "It makes no sense to sort a single node."); - Item::List nodes(m_operand->evaluateSequence(context)->toList()); + Item::List nodes(m_operand->evaluateSequence(context)->toVector()); if(nodes.isEmpty()) return CommonValues::emptyIterator; diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index 1be2469..8561785 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -68,12 +68,12 @@ namespace QPatternist public: NodeSortExpression(const Expression::Ptr &operand); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; /** * Ensures that result delivered from @p operand, is in document order. diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index 2ed424a..5a00cd5 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -68,7 +68,7 @@ namespace QPatternist { public: ByIDIdentifier(const Expression::ID id); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const Expression::ID m_id; }; @@ -100,7 +100,7 @@ namespace QPatternist * the SequenceType passed in the BySequenceTypeIdentifier() * constructor, otherwise @c false. */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const SequenceType::Ptr m_seqType; @@ -135,7 +135,7 @@ namespace QPatternist * @returns @c true, if @p expr is a ValueComparison with the operator * passed in ComparisonIdentifier(). */ - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const QVector<Expression::ID> m_hosts; @@ -156,7 +156,7 @@ namespace QPatternist { public: IntegerIdentifier(const xsInteger num); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const xsInteger m_num; @@ -175,7 +175,7 @@ namespace QPatternist { public: BooleanIdentifier(const bool value); - virtual bool matches(const Expression::Ptr &expr) const; + bool matches(const Expression::Ptr &expr) const override; private: const bool m_value; @@ -198,9 +198,9 @@ namespace QPatternist * of the type that @p id identifies. */ ByIDCreator(const Expression::ID id); - virtual Expression::Ptr create(const Expression::List &operands, - const StaticContext::Ptr &context, - const SourceLocationReflection *const r) const; + Expression::Ptr create(const Expression::List &operands, + const StaticContext::Ptr &context, + const SourceLocationReflection *const r) const override; /** * Creates an expression by id @p id with the arguments @p operands. diff --git a/src/xmlpatterns/expr/qorderby.cpp b/src/xmlpatterns/expr/qorderby.cpp index 5688bcd..2285f7f 100644 --- a/src/xmlpatterns/expr/qorderby.cpp +++ b/src/xmlpatterns/expr/qorderby.cpp @@ -183,7 +183,7 @@ Item::Iterator::Ptr OrderBy::mapToSequence(const Item &i, Item::Iterator::Ptr OrderBy::evaluateSequence(const DynamicContext::Ptr &context) const { - Item::List tuples(m_operand->evaluateSequence(context)->toList()); + Item::List tuples(m_operand->evaluateSequence(context)->toVector()); const std::less<Item::List> sorter(m_orderSpecs, context); diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index dcc567b..40a0d20 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -147,17 +147,17 @@ namespace QPatternist const Expression::Ptr &operand, ReturnOrderBy *const returnOrderBy); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item::Iterator::Ptr mapToSequence(const Item &i, const DynamicContext::Ptr &context) const; - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index eb2d2bd..3e50886 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -70,10 +70,10 @@ namespace QPatternist OrExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index 7d864a6..ddcd8fd 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -66,9 +66,9 @@ namespace QPatternist class PairContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: PairContainer(const Expression::Ptr &operand1, const Expression::Ptr &operand2); diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index cede13b..58dfde1 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -71,24 +71,24 @@ namespace QPatternist class ParentNodeAxis : public EmptyContainer { public: - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * @returns always DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always CommonSequenceTypes::ExactlyOneNode; */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns always BuiltinTypes::node; */ - virtual ItemType::Ptr expectedContextItemType() const; + ItemType::Ptr expectedContextItemType() const override; }; } diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index f3e3b59..cab190d 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -96,35 +96,35 @@ namespace QPatternist const Kind kind = RegularPath); ~Path(); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns the static type of the last step where the cardinality is multiplied with * the cardinality of the first step's cardinality. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the item type of the last step's static type. */ - virtual ItemType::Ptr newFocusType() const; + ItemType::Ptr newFocusType() const override; - virtual ID id() const; + ID id() const override; inline void setLast(); diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index 91be948..2728892 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -69,7 +69,7 @@ namespace QPatternist typedef QExplicitlySharedDataPointer<PositionalVariableReference> Ptr; PositionalVariableReference(const VariableSlotID slot); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; /** * Returns always @c true, since a positional variable is always one or more, and the @@ -77,15 +77,15 @@ namespace QPatternist * * @returns always @c true */ - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; /** * @returns always CommonSequenceTypes::ExactlyOneInteger */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index 9375104..8593174 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -71,20 +71,20 @@ namespace QPatternist ProcessingInstructionConstructor(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Both arguments must of type @c xs:string. It is assumes that the first argument's * lexical space is @c xs:NCName. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; private: inline QXmlName evaluateTardata(const DynamicContext::Ptr &context) const; /** diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index 6aab322..49fcb07 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -75,13 +75,13 @@ namespace QPatternist QNameConstructor(const Expression::Ptr &source, const NamespaceResolver::Ptr &nsResolver); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Expands @p lexicalQName, which is a lexical representation of a QName such as "x:body", into @@ -121,7 +121,7 @@ namespace QPatternist const StaticContext::Ptr &context, const SourceLocationReflection *const r); - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: const NamespaceResolver::Ptr m_nsResolver; diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index b448368..29a9e26 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -78,9 +78,9 @@ namespace QPatternist const Expression::Ptr &inClause, const Expression::Ptr &testExpression); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; Operator operatorID() const; @@ -92,7 +92,7 @@ namespace QPatternist */ static QString displayName(const Operator quantifier); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index e5c41a1..f26cf5d 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -73,20 +73,20 @@ namespace QPatternist public: RangeExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; /** * It's likely that this function gets called if staticType() inferred * the cardinality to an exact number. In that case, we know that the * first arguments is the same as the second argument. */ - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns always CommonSequenceTypes::ZeroOrMoreIntegers */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * Disables compression for optimization reasons. For example, the @@ -95,9 +95,9 @@ namespace QPatternist * * @returns Expression::DisableElimination */ - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index 85336c5..406fe20 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -73,17 +73,17 @@ namespace QPatternist RangeVariableReference(const Expression::Ptr &sourceExpression, const VariableSlotID slot); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; /** * @returns IDRangeVariableReference */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; private: const Expression::Ptr m_sourceExpression; }; diff --git a/src/xmlpatterns/expr/qreturnorderby.cpp b/src/xmlpatterns/expr/qreturnorderby.cpp index 5437a83..b7b295f 100644 --- a/src/xmlpatterns/expr/qreturnorderby.cpp +++ b/src/xmlpatterns/expr/qreturnorderby.cpp @@ -62,7 +62,7 @@ ReturnOrderBy::ReturnOrderBy(const OrderBy::Stability aStability, Item ReturnOrderBy::evaluateSingleton(const DynamicContext::Ptr &context) const { Q_ASSERT(m_operands.size() > 1); - const Item::Iterator::Ptr value(makeListIterator(m_operands.first()->evaluateSequence(context)->toList())); + const Item::Iterator::Ptr value(makeListIterator(m_operands.first()->evaluateSequence(context)->toVector())); Item::Vector sortKeys; /* We're skipping the first operand. */ diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index 3ea9df9..1f8b2c1 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -77,13 +77,13 @@ namespace QPatternist const OrderBy::OrderSpec::Vector &oSpecs, const Expression::List &operands); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + Expression::Ptr compress(const StaticContext::Ptr &context) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline OrderBy::OrderSpec::Vector orderSpecs() const { @@ -107,7 +107,7 @@ namespace QPatternist m_flyAway = !a; } - virtual Properties properties() const; + Properties properties() const override; private: /** * This variable is unfortunately only used at compile time. However, diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index 595018f..144d0bd 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -74,14 +74,14 @@ namespace QPatternist public: SimpleContentConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 6d016be..ec12f8f 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -67,10 +67,10 @@ namespace QPatternist public: ~SingleContainer(); - virtual Expression::List operands() const; + Expression::List operands() const override; - virtual void setOperands(const Expression::List &operands); - virtual bool compressOperands(const StaticContext::Ptr &); + void setOperands(const Expression::List &operands) override; + bool compressOperands(const StaticContext::Ptr &) override; protected: SingleContainer(const Expression::Ptr &operand); diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 3405aac..2030218 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -111,8 +111,8 @@ namespace QPatternist Q_ASSERT(r); } - virtual const SourceLocationReflection *actualReflection() const; - virtual QString description() const; + const SourceLocationReflection *actualReflection() const override; + QString description() const override; private: const SourceLocationReflection *const m_r; diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index f0783f2..44d6e78 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -74,11 +74,11 @@ namespace QPatternist */ StaticBaseURIStore(const QUrl &baseURI, const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const QUrl m_baseURI; diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index e3c8986..c2ba6b1 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -73,11 +73,11 @@ namespace QPatternist * absolute. */ StaticCompatibilityStore(const Expression::Ptr &operand); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index 5ec3ad4..c51f405 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -97,7 +97,7 @@ namespace QPatternist /** * Returns @c this. */ - virtual const SourceLocationReflection* actualReflection() const; + const SourceLocationReflection* actualReflection() const override; const ImportPrecedence importPrecedence; diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index c389543..934e546 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -76,7 +76,7 @@ namespace QPatternist class TemplateInvoker : public CallSite { public: - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; inline const WithParam::Hash &withParams() const; WithParam::Hash m_withParams; @@ -90,7 +90,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a> */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; protected: /** * @p withParams may be empty. diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index d9e1722..2441b22 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -69,13 +69,13 @@ namespace QPatternist public: TemplateParameterReference(const VariableDeclaration *varDecl); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual Properties properties() const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + Properties properties() const override; inline const Expression::Ptr &sourceExpression() const; inline const VariableDeclaration *variableDeclaration() const; diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 7357d04..f021065 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -70,19 +70,19 @@ namespace QPatternist public: TextNodeConstructor(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * The first operand must be exactly one @c xs:string. */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; - virtual Properties properties() const; + Properties properties() const override; }; } diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index f9acf69..2d7b541 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -90,21 +90,21 @@ namespace QPatternist * is verified. Then, the type the <tt>treat as</tt> expression itself must match, @p reqType, * is verified. */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always the SequenceType passed in the constructor to this class. That is, the * SequenceType that the operand must conform to. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; /** * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: const SequenceType::Ptr m_reqType; diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index 3fec57d..9e9f9ab 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -65,10 +65,10 @@ namespace QPatternist class TripleContainer : public Expression { public: - virtual Expression::List operands() const; - virtual void setOperands(const Expression::List &operands); + Expression::List operands() const override; + void setOperands(const Expression::List &operands) override; - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; protected: TripleContainer(const Expression::Ptr &operand1, diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 3362c14..d019a0e 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -96,8 +96,8 @@ namespace QPatternist return CommonValues::emptyIterator; } - virtual SequenceType::List expectedOperandTypes() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::List expectedOperandTypes() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; }; } diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index 77da0c7..83c5870 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -96,7 +96,7 @@ namespace QPatternist const Expression::Ptr &operand, const StaticContext::Ptr &context); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; private: Q_DISABLE_COPY(UnaryExpression) diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index e03f6e4..80ce878 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -73,14 +73,14 @@ namespace QPatternist */ UnlimitedContainer(const Expression::List &operands = Expression::List()); - virtual void setOperands(const Expression::List &list); + void setOperands(const Expression::List &list) override; - virtual Expression::List operands() const; + Expression::List operands() const override; /** * @note This function cannot be called before setOperands is called. */ - virtual bool compressOperands(const StaticContext::Ptr &); + bool compressOperands(const StaticContext::Ptr &) override; /** * Tells how operandsUnionType() should compute the cardinality of diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index 348d73e..aface34 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -72,12 +72,12 @@ namespace QPatternist public: UnresolvedVariableReference(const QXmlName &name); - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual ID id() const; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + ID id() const override; inline void bindTo(const Expression::Ptr &body); diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h index 15f10e8..5ec6232 100644 --- a/src/xmlpatterns/expr/quserfunction_p.h +++ b/src/xmlpatterns/expr/quserfunction_p.h @@ -51,6 +51,7 @@ #define Patternist_UserFunction_H #include <QSharedData> +#include <qcontainerfwd.h> #include <private/qexpression_p.h> #include <private/qfunctionsignature_p.h> @@ -58,8 +59,6 @@ QT_BEGIN_NAMESPACE -template<typename T> class QList; - namespace QPatternist { /** diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index 006540a..5b9bf7d 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -81,35 +81,35 @@ namespace QPatternist UserFunctionCallsite(const QXmlName name, const FunctionSignature::Arity arity); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; - virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; + void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * We call compress on our body. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; - virtual Expression::Properties properties() const; + Expression::Properties properties() const override; /** * @short Returns the types declared in the function declaration. * * @see CallTemplate::expectedOperandTypes() */ - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; - virtual SequenceType::Ptr staticType() const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + SequenceType::Ptr staticType() const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @returns always IDUserFunctionCallsite. */ - virtual ID id() const; + ID id() const override; /** * If @p slotOffset is -1, it means this function has no arguments. @@ -125,13 +125,13 @@ namespace QPatternist FunctionSignature::Arity arity() const; - inline Expression::Ptr body() const + inline Expression::Ptr body() const override { return m_body; } - virtual bool configureRecursion(const CallTargetDescription::Ptr &sign); - virtual CallTargetDescription::Ptr callTargetDescription() const; + bool configureRecursion(const CallTargetDescription::Ptr &sign) override; + CallTargetDescription::Ptr callTargetDescription() const override; private: /** diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 9566dfb..b2466a7 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -79,30 +79,30 @@ namespace QPatternist const Expression::Ptr &op2); ~ValueComparison(); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; /** * @returns always CommonSequenceTypes::ExactlyOneBoolean */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::List expectedOperandTypes() const override; /** * @returns IDValueComparison */ - virtual ID id() const; + ID id() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override; /** * Overridden to optimize case-insensitive compares. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * @returns the operator that this ValueComparison is using. diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index 807b55b..2a42b3a 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -51,11 +51,10 @@ #define Patternist_VariableReference_H #include <private/qemptycontainer_p.h> +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE -template<typename T> class QList; - namespace QPatternist { /** @@ -91,7 +90,7 @@ namespace QPatternist /** * @returns DisableElimination */ - virtual Properties properties() const; + Properties properties() const override; private: /** diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index afa49df..002fcf9 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -69,10 +69,10 @@ namespace QPatternist { public: XSLTSimpleContentConstructor(const Expression::Ptr &source); - virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; + Item evaluateSingleton(const DynamicContext::Ptr &context) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; private: static inline QString processItem(const Item &item, bool &discard, diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index 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; }; } diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h index 27b29a4..7d54c26 100644 --- a/src/xmlpatterns/iterators/qcachingiterator_p.h +++ b/src/xmlpatterns/iterators/qcachingiterator_p.h @@ -83,10 +83,10 @@ namespace QPatternist const VariableSlotID slot, const DynamicContext::Ptr &context); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: Item m_current; diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h index cc30c7f..c975f63 100644 --- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h +++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h @@ -76,9 +76,9 @@ namespace QPatternist public: DeduplicateIterator(const Item::List &source); - virtual Item next(); - virtual Item::Iterator::Ptr copy() const; - virtual xsInteger count(); + Item next() override; + Item::Iterator::Ptr copy() const override; + xsInteger count() override; private: /** diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h index 1b70307..e639a5a 100644 --- a/src/xmlpatterns/iterators/qdistinctiterator_p.h +++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h @@ -96,11 +96,11 @@ namespace QPatternist const Expression::ConstPtr &expression, const DynamicContext::Ptr &context); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; - virtual const SourceLocationReflection *actualReflection() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; + const SourceLocationReflection *actualReflection() const override; inline AtomicComparator::Operator operatorID() const { diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h index ad10bbc..2374382 100644 --- a/src/xmlpatterns/iterators/qemptyiterator_p.h +++ b/src/xmlpatterns/iterators/qemptyiterator_p.h @@ -76,7 +76,7 @@ namespace QPatternist /** * @returns always a default constructed value, T(). */ - virtual T next() + T next() override { return T(); } @@ -84,7 +84,7 @@ namespace QPatternist /** * @returns always a default constructed value, T(). */ - virtual T current() const + T current() const override { return T(); } @@ -92,7 +92,7 @@ namespace QPatternist /** * @returns always 0. */ - virtual xsInteger position() const + xsInteger position() const override { return 0; } @@ -100,7 +100,7 @@ namespace QPatternist /** * @returns always @c this, the reverse of <tt>()</tt> is <tt>()</tt>. */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr toReversed() + typename QAbstractXmlForwardIterator<T>::Ptr toReversed() override { return typename QAbstractXmlForwardIterator<T>::Ptr(const_cast<EmptyIterator<T> *>(this)); } @@ -108,7 +108,7 @@ namespace QPatternist /** * @returns always 0 */ - virtual xsInteger count() + xsInteger count() override { return 0; } @@ -116,7 +116,7 @@ namespace QPatternist /** * @returns @c this */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr copy() const + typename QAbstractXmlForwardIterator<T>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<T>::Ptr(const_cast<EmptyIterator *>(this)); } diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h index 757192c..afd6b2b 100644 --- a/src/xmlpatterns/iterators/qexceptiterator_p.h +++ b/src/xmlpatterns/iterators/qexceptiterator_p.h @@ -73,10 +73,10 @@ namespace QPatternist ExceptIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item fromFirstOperand(); diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h index d156821..28714f5 100644 --- a/src/xmlpatterns/iterators/qindexofiterator_p.h +++ b/src/xmlpatterns/iterators/qindexofiterator_p.h @@ -95,17 +95,17 @@ namespace QPatternist const DynamicContext::Ptr &context, const Expression::ConstPtr &expr); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; inline AtomicComparator::Operator operatorID() const { return AtomicComparator::OperatorEqual; } - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: const Item::Iterator::Ptr m_seq; diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h index ab49132..7372ed8 100644 --- a/src/xmlpatterns/iterators/qinsertioniterator_p.h +++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h @@ -93,11 +93,11 @@ namespace QPatternist const xsInteger position, const Item::Iterator::Ptr &insertIterator); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr copy() const override; private: const Item::Iterator::Ptr m_target; diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h index 24977ac..5ebce6b 100644 --- a/src/xmlpatterns/iterators/qintersectiterator_p.h +++ b/src/xmlpatterns/iterators/qintersectiterator_p.h @@ -74,10 +74,10 @@ namespace QPatternist IntersectIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item closedExit() diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h index af48631..9e4f8d3 100644 --- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h +++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h @@ -111,7 +111,7 @@ namespace QPatternist * @returns the next item in the sequence, or * @c null if the end have been reached. */ - virtual TResult next() + TResult next() override { while (true) { @@ -138,17 +138,17 @@ namespace QPatternist } } - virtual TResult current() const + TResult current() const override { return m_current; } - virtual xsInteger position() const + xsInteger position() const override { return m_position; } - virtual typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const + typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<TResult>::Ptr (new ItemMappingIterator<TResult, TSource, TMapper, Context>(m_mapper, m_it->copy(), m_context)); diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h index 22538cd..14e919c 100644 --- a/src/xmlpatterns/iterators/qrangeiterator_p.h +++ b/src/xmlpatterns/iterators/qrangeiterator_p.h @@ -108,12 +108,12 @@ namespace QPatternist const Direction direction, const xsInteger end); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr toReversed(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr toReversed() override; + Item::Iterator::Ptr copy() const override; private: xsInteger m_start; diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h index b2bc453..bf0fb6b 100644 --- a/src/xmlpatterns/iterators/qremovaliterator_p.h +++ b/src/xmlpatterns/iterators/qremovaliterator_p.h @@ -91,17 +91,17 @@ namespace QPatternist RemovalIterator(const Item::Iterator::Ptr &target, const xsInteger position); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; + Item next() override; + Item current() const override; + xsInteger position() const override; /** * The QAbstractXmlForwardIterator's count is computed by subtracting one from the source * QAbstractXmlForwardIterator's count. */ - virtual xsInteger count(); + xsInteger count() override; - virtual Item::Iterator::Ptr copy() const; + Item::Iterator::Ptr copy() const override; private: const Item::Iterator::Ptr m_target; diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h index e687d8b..045c812 100644 --- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h +++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h @@ -97,16 +97,16 @@ namespace QPatternist const typename QAbstractXmlForwardIterator<TSource>::Ptr &sourceIterator, const DynamicContext::Ptr &context); - virtual TResult next(); - virtual xsInteger count(); - virtual TResult current() const; - virtual xsInteger position() const; + TResult next() override; + xsInteger count() override; + TResult current() const override; + xsInteger position() const override; /** * The reason the implementation is placed in line here, is due to a bug * in MSVC-2005 version 14.00.50727.762. Note that it works with version 14.00.50727.42. */ - virtual typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const + typename QAbstractXmlForwardIterator<TResult>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<TResult>::Ptr (new SequenceMappingIterator<TResult, TSource, TMapper>(m_mapper, diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h index ceccfb5..2e03c17 100644 --- a/src/xmlpatterns/iterators/qsingletoniterator_p.h +++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h @@ -87,7 +87,7 @@ namespace QPatternist Q_ASSERT(!qIsForwardIteratorEnd(item)); } - virtual T next() + T next() override { switch(m_position) { @@ -109,7 +109,7 @@ namespace QPatternist } } - virtual T current() const + T current() const override { if(m_position == 1) return m_item; @@ -117,7 +117,7 @@ namespace QPatternist return T(); } - virtual xsInteger position() const + xsInteger position() const override { return m_position; } @@ -125,7 +125,7 @@ namespace QPatternist /** * @returns a copy of this instance, rewinded to the beginning. */ - virtual typename QAbstractXmlForwardIterator<T>::Ptr toReversed() + typename QAbstractXmlForwardIterator<T>::Ptr toReversed() override { return typename QAbstractXmlForwardIterator<T>::Ptr(new SingletonIterator<T>(m_item)); } @@ -133,12 +133,12 @@ namespace QPatternist /** * @returns always 1 */ - virtual xsInteger count() + xsInteger count() override { return 1; } - virtual typename QAbstractXmlForwardIterator<T>::Ptr copy() const + typename QAbstractXmlForwardIterator<T>::Ptr copy() const override { return typename QAbstractXmlForwardIterator<T>::Ptr(new SingletonIterator(m_item)); } diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h index b1d40e4..e4984ca 100644 --- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h +++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h @@ -91,10 +91,10 @@ namespace QPatternist const xsInteger start, const xsInteger length); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: xsInteger m_position; diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h index f4ed9da..138c68c 100644 --- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h +++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h @@ -78,11 +78,11 @@ namespace QPatternist * empty. */ ToCodepointsIterator(const QString &string); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual xsInteger count(); - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + xsInteger count() override; + Item::Iterator::Ptr copy() const override; private: const QString m_string; diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h index 7984847..1419655 100644 --- a/src/xmlpatterns/iterators/qunioniterator_p.h +++ b/src/xmlpatterns/iterators/qunioniterator_p.h @@ -73,10 +73,10 @@ namespace QPatternist UnionIterator(const Item::Iterator::Ptr &it1, const Item::Iterator::Ptr &it2); - virtual Item next(); - virtual Item current() const; - virtual xsInteger position() const; - virtual Item::Iterator::Ptr copy() const; + Item next() override; + Item current() const override; + xsInteger position() const override; + Item::Iterator::Ptr copy() const override; private: inline Item nextFromFirstOperand() diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h index d9fe014..2caaab4 100644 --- a/src/xmlpatterns/janitors/qargumentconverter_p.h +++ b/src/xmlpatterns/janitors/qargumentconverter_p.h @@ -78,13 +78,13 @@ namespace QPatternist ArgumentConverter(const Expression::Ptr &operand, const ItemType::Ptr &reqType); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; private: typedef QExplicitlySharedDataPointer<const ArgumentConverter> ConstPtr; diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h index 0036b8a..ab78934 100644 --- a/src/xmlpatterns/janitors/qatomizer_p.h +++ b/src/xmlpatterns/janitors/qatomizer_p.h @@ -74,25 +74,25 @@ namespace QPatternist public: Atomizer(const Expression::Ptr &operand); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual const SourceLocationReflection *actualReflection() const; + SequenceType::List expectedOperandTypes() const override; + const SourceLocationReflection *actualReflection() const override; /** * Makes an early compression, by returning the result of * the type checked operand, if the operand has the static type * xs:anyAtomicType(no atomization needed). */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline Item::Iterator::Ptr mapToSequence(const Item &item, const DynamicContext::Ptr &context) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; private: typedef QExplicitlySharedDataPointer<const Atomizer> ConstPtr; diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h index d083878..b538e99 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h +++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h @@ -72,20 +72,20 @@ namespace QPatternist const Cardinality &card, const ReportContext::ErrorCode code); - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * If the static cardinality of the operand is within the required cardinality, * the operand is returned as is, since results will always be valid and hence * is not a CardinalityVerifier necessary. */ - virtual Expression::Ptr compress(const StaticContext::Ptr &context); + Expression::Ptr compress(const StaticContext::Ptr &context) override; /** * A utility function for determining whether the static type of an Expression matches @@ -100,9 +100,9 @@ namespace QPatternist const StaticContext::Ptr &context, const ReportContext::ErrorCode code = ReportContext::XPTY0004); - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; - ID id() const; + ID id() const override; private: /** * Centralizes a message string in order to increase consistency and diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h index 46cf058..a21f33f 100644 --- a/src/xmlpatterns/janitors/qebvextractor_p.h +++ b/src/xmlpatterns/janitors/qebvextractor_p.h @@ -72,17 +72,17 @@ namespace QPatternist { public: EBVExtractor(const Expression::Ptr &operand); - virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; - virtual SequenceType::List expectedOperandTypes() const; - virtual const SourceLocationReflection *actualReflection() const; - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + bool evaluateEBV(const DynamicContext::Ptr &context) const override; + SequenceType::List expectedOperandTypes() const override; + const SourceLocationReflection *actualReflection() const override; + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * @short Returns always @c xs:boolean. */ - virtual SequenceType::Ptr staticType() const; + SequenceType::Ptr staticType() const override; template<typename TSubClass, typename ThisType> static Expression::Ptr typeCheck(const StaticContext::Ptr &context, diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h index db46cbb..e708a48 100644 --- a/src/xmlpatterns/janitors/qitemverifier_p.h +++ b/src/xmlpatterns/janitors/qitemverifier_p.h @@ -72,15 +72,15 @@ namespace QPatternist const ItemType::Ptr &reqType, const ReportContext::ErrorCode errorCode); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::List expectedOperandTypes() const; - virtual SequenceType::Ptr staticType() const; + SequenceType::List expectedOperandTypes() const override; + SequenceType::Ptr staticType() const override; inline Item mapToItem(const Item &, const DynamicContext::Ptr &) const; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; - virtual const SourceLocationReflection *actualReflection() const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; + const SourceLocationReflection *actualReflection() const override; private: typedef QExplicitlySharedDataPointer<const ItemVerifier> ConstPtr; diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h index 118a14c..285ce0c 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h +++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h @@ -81,19 +81,19 @@ namespace QPatternist const ItemType::Ptr &reqType, const ReportContext::ErrorCode code = ReportContext::FORG0001); - virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; - virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const; + Item evaluateSingleton(const DynamicContext::Ptr &) const override; + Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override; - virtual SequenceType::Ptr staticType() const; - virtual SequenceType::List expectedOperandTypes() const; + SequenceType::Ptr staticType() const override; + SequenceType::List expectedOperandTypes() const override; - virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const; + ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override; /** * Overridden to call CastingPlatform::typeCheck() */ - virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, - const SequenceType::Ptr &reqType); + Expression::Ptr typeCheck(const StaticContext::Ptr &context, + const SequenceType::Ptr &reqType) override; inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const; @@ -103,7 +103,7 @@ namespace QPatternist return m_reqType; } - virtual const SourceLocationReflection *actualReflection() const; + const SourceLocationReflection *actualReflection() const override; private: typedef QExplicitlySharedDataPointer<const UntypedAtomicConverter> ConstPtr; diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index 76abfa8..84cd8f3 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -385,17 +385,17 @@ public: { } - virtual const SourceLocationReflection *actualReflection() const + const SourceLocationReflection *actualReflection() const override { return this; } - virtual QSourceLocation sourceLocation() const + QSourceLocation sourceLocation() const override { return fromYYLTYPE(m_sl, m_parseInfo); } - virtual QString description() const + QString description() const override { Q_ASSERT(false); return QString(); diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h index 7d49ecc..e958534 100644 --- a/src/xmlpatterns/parser/qtokenrevealer_p.h +++ b/src/xmlpatterns/parser/qtokenrevealer_p.h @@ -74,10 +74,10 @@ namespace QPatternist virtual ~TokenRevealer(); - virtual Token nextToken(XPATHLTYPE *const sourceLocator); - virtual int commenceScanOnly(); - virtual void resumeTokenizationFrom(const int position); - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + Token nextToken(XPATHLTYPE *const sourceLocator) override; + int commenceScanOnly() override; + void resumeTokenizationFrom(const int position) override; + void setParserContext(const ParserContext::Ptr &parseInfo) override; private: const Tokenizer::Ptr m_tokenizer; diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h index 13e7297..edcf178 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer_p.h +++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h @@ -106,14 +106,14 @@ namespace QPatternist const QUrl &location, const State startingState = Default); - virtual Token nextToken(XPATHLTYPE *const sourceLocator); - virtual int commenceScanOnly(); - virtual void resumeTokenizationFrom(const int position); + Token nextToken(XPATHLTYPE *const sourceLocator) override; + int commenceScanOnly() override; + void resumeTokenizationFrom(const int position) override; /** * Does nothing. */ - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + void setParserContext(const ParserContext::Ptr &parseInfo) override; private: diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h index 5cab482..d75bca1 100644 --- a/src/xmlpatterns/parser/qxslttokenizer_p.h +++ b/src/xmlpatterns/parser/qxslttokenizer_p.h @@ -79,7 +79,7 @@ namespace QPatternist inline SingleTokenContainer(const Tokenizer::Token &token, const XPATHLTYPE &location); - virtual Tokenizer::Token nextToken(XPATHLTYPE *const sourceLocator); + Tokenizer::Token nextToken(XPATHLTYPE *const sourceLocator) override; private: const Tokenizer::Token m_token; const XPATHLTYPE m_location; @@ -118,27 +118,27 @@ namespace QPatternist const ReportContext::Ptr &context, const NamePool::Ptr &np); - virtual Token nextToken(XPATHLTYPE *const sourceLocator); + Token nextToken(XPATHLTYPE *const sourceLocator) override; /** * For XSLT we don't need this mechanism, so we do nothing. */ - virtual int commenceScanOnly(); + int commenceScanOnly() override; /** * For XSLT we don't need this mechanism, so we do nothing. */ - virtual void resumeTokenizationFrom(const int position); + void resumeTokenizationFrom(const int position) override; - virtual void setParserContext(const ParserContext::Ptr &parseInfo); + void setParserContext(const ParserContext::Ptr &parseInfo) override; - virtual QUrl documentURI() const + QUrl documentURI() const override { return queryURI(); } protected: - virtual bool isAnyAttributeAllowed() const; + bool isAnyAttributeAllowed() const override; private: inline void validateElement() const; diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h index c14d6da..95f2eba 100644 --- a/src/xmlpatterns/projection/qdocumentprojector_p.h +++ b/src/xmlpatterns/projection/qdocumentprojector_p.h @@ -68,25 +68,25 @@ namespace QPatternist DocumentProjector(const ProjectedExpression::Vector &paths, QAbstractXmlReceiver *const receiver); - virtual void namespaceBinding(const QXmlName &nb); + void namespaceBinding(const QXmlName &nb) override; - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); + void startDocument() override; + void endDocument() override; ProjectedExpression::Vector m_paths; const int m_pathCount; diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h index ec45285..996d23c 100644 --- a/src/xmlpatterns/projection/qprojectedexpression_p.h +++ b/src/xmlpatterns/projection/qprojectedexpression_p.h @@ -109,8 +109,8 @@ namespace QPatternist Q_UNUSED(axis); } - virtual Action actionForElement(const QXmlName name, - ProjectedExpression::Ptr &next) const + Action actionForElement(const QXmlName name, + ProjectedExpression::Ptr &next) const override { Q_UNUSED(name); Q_UNUSED(next); @@ -132,8 +132,8 @@ namespace QPatternist Q_UNUSED(right); } - virtual Action actionForElement(const QXmlName name, - ProjectedExpression::Ptr &next) const + Action actionForElement(const QXmlName name, + ProjectedExpression::Ptr &next) const override { ProjectedExpression::Ptr &candidateNext = next; const Action a = m_left->actionForElement(name, candidateNext); diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h index 544841d..493866a 100644 --- a/src/xmlpatterns/schema/qxsdattributereference_p.h +++ b/src/xmlpatterns/schema/qxsdattributereference_p.h @@ -90,12 +90,12 @@ namespace QPatternist /** * Always returns false, used to avoid dynamic casts. */ - virtual bool isAttributeUse() const; + bool isAttributeUse() const override; /** * Always returns true, used to avoid dynamic casts. */ - virtual bool isReference() const; + bool isReference() const override; /** * Sets the @p type of the attribute reference. diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h index 3559f7c..1d2ccce 100644 --- a/src/xmlpatterns/schema/qxsdattributeuse_p.h +++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h @@ -158,7 +158,7 @@ namespace QPatternist /** * Always returns true, used to avoid dynamic casts. */ - virtual bool isAttributeUse() const; + bool isAttributeUse() const override; /** * Sets the use @p type of the attribute use. diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h index 1e7a027..0059d08 100644 --- a/src/xmlpatterns/schema/qxsdcomplextype_p.h +++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h @@ -242,7 +242,7 @@ namespace QPatternist * * @param namePool The name pool where the type name is stored in. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the base type of the complex type. @@ -254,7 +254,7 @@ namespace QPatternist /** * Returns the base type of the complex type. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * Sets the context @p component of the complex type. @@ -282,7 +282,7 @@ namespace QPatternist /** * Returns the derivation method of the complex type. */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; /** * Sets whether the complex type is @p abstract. @@ -294,7 +294,7 @@ namespace QPatternist /** * Returns whether the complex type is abstract. */ - virtual bool isAbstract() const; + bool isAbstract() const override; /** * Sets the list of all attribute @p uses of the complex type. @@ -328,7 +328,7 @@ namespace QPatternist /** * Always returns SchemaType::ComplexType */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * Sets the content @p type of the complex type. @@ -378,7 +378,7 @@ namespace QPatternist /** * Always returns @c true. */ - virtual bool isDefinedBySchema() const; + bool isDefinedBySchema() const override; private: SchemaType::Ptr m_superType; diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h index 12dd12d..d271644 100644 --- a/src/xmlpatterns/schema/qxsdelement_p.h +++ b/src/xmlpatterns/schema/qxsdelement_p.h @@ -236,7 +236,7 @@ namespace QPatternist /** * Always returns @c true, used to avoid dynamic casts. */ - virtual bool isElement() const; + bool isElement() const override; /** * Sets the @p type of the element. diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h index 3d07a63..22073bf 100644 --- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h +++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h @@ -52,11 +52,10 @@ #include <private/qxsdparticle_p.h> #include <private/qxsdterm_p.h> +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE -template<typename N> class QList; - namespace QPatternist { /** @@ -96,7 +95,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isModelGroup() const; + bool isModelGroup() const override; /** * Sets the @p compositor of the model group. diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h index 4372978..e1a4b03 100644 --- a/src/xmlpatterns/schema/qxsdreference_p.h +++ b/src/xmlpatterns/schema/qxsdreference_p.h @@ -90,7 +90,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isReference() const; + bool isReference() const override; /** * Sets the @p type of the reference. diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h index 0f11979..b102472 100644 --- a/src/xmlpatterns/schema/qxsdschemacontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h @@ -94,7 +94,7 @@ namespace QPatternist /** * Returns the name pool of the schema context. */ - virtual NamePool::Ptr namePool() const; + NamePool::Ptr namePool() const override; /** * Sets the base URI for the main schema. @@ -130,12 +130,12 @@ namespace QPatternist * Returns the message handler used by the context for * error reporting. */ - virtual QAbstractMessageHandler* messageHandler() const; + QAbstractMessageHandler* messageHandler() const override; /** * Always returns an empty source location. */ - virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const; + QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override; /** * Sets the uri @p resolver that is used for resolving URIs in the @@ -147,7 +147,7 @@ namespace QPatternist * Returns the uri resolver that is used for resolving URIs in the * schema parser. */ - virtual const QAbstractUriResolver* uriResolver() const; + const QAbstractUriResolver* uriResolver() const override; /** * Returns the list of facets for the given simple @p type. diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h index 8095ceb..a8b8da6 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h @@ -164,12 +164,12 @@ namespace QPatternist /** * Returns the document URI of the schema to parse. */ - QUrl documentURI() const; + QUrl documentURI() const override; /** * Reimplemented from MaintainingReader, always returns @c false. */ - bool isAnyAttributeAllowed() const; + bool isAnyAttributeAllowed() const override; private: /** diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h index 4d14484..12b3de4 100644 --- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h +++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h @@ -80,12 +80,12 @@ namespace QPatternist * * @note This does not handle user defined types, only builtin types. */ - virtual SchemaType::Ptr createSchemaType(const QXmlName) const; + SchemaType::Ptr createSchemaType(const QXmlName) const override; /** * Returns a hash of all available types. */ - virtual SchemaType::Hash types() const; + SchemaType::Hash types() const override; private: /** diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h index 7b1a2ea..c0ab9f7 100644 --- a/src/xmlpatterns/schema/qxsdsimpletype_p.h +++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h @@ -83,7 +83,7 @@ namespace QPatternist * * @param namePool The name pool the type name is stored in. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the base @p type of the simple type. @@ -96,7 +96,7 @@ namespace QPatternist * Returns the base type of the simple type or an empty pointer if no base type is * set. */ - virtual SchemaType::Ptr wxsSuperType() const; + SchemaType::Ptr wxsSuperType() const override; /** * Sets the context @p component of the simple type. @@ -177,7 +177,7 @@ namespace QPatternist /** * Returns the category (variety) of the simple type. */ - virtual TypeCategory category() const; + TypeCategory category() const override; /** * Sets the derivation @p method of the simple type. @@ -189,12 +189,12 @@ namespace QPatternist /** * Returns the derivation method of the simple type. */ - virtual DerivationMethod derivationMethod() const; + DerivationMethod derivationMethod() const override; /** * Always returns @c true. */ - virtual bool isDefinedBySchema() const; + bool isDefinedBySchema() const override; private: SchemaType::Ptr m_superType; diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h index 3fd6efa..9dcbf6f 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker_p.h +++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h @@ -73,8 +73,8 @@ namespace QPatternist public: XsdSchemaSourceLocationReflection(const QSourceLocation &location); - virtual const SourceLocationReflection *actualReflection() const; - virtual QSourceLocation sourceLocation() const; + const SourceLocationReflection *actualReflection() const override; + QSourceLocation sourceLocation() const override; private: const QSourceLocation m_sourceLocation; diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h index cf1841c..f98b2ae 100644 --- a/src/xmlpatterns/schema/qxsduserschematype_p.h +++ b/src/xmlpatterns/schema/qxsduserschematype_p.h @@ -53,12 +53,10 @@ #include <private/qnamedschemacomponent_p.h> #include <private/qschematype_p.h> #include <private/qxsdannotated_p.h> +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE -template<typename N, typename M> class QHash; -template<typename N> class QList; - namespace QPatternist { /** @@ -86,14 +84,14 @@ namespace QPatternist * * @param namePool The pool the name belongs to. */ - virtual QXmlName name(const NamePool::Ptr &namePool) const; + QXmlName name(const NamePool::Ptr &namePool) const override; /** * Returns the display name of the type. * * @param namePool The pool the name belongs to. */ - virtual QString displayName(const NamePool::Ptr &namePool) const; + QString displayName(const NamePool::Ptr &namePool) const override; /** * Sets the derivation @p constraints of the type. @@ -103,7 +101,7 @@ namespace QPatternist /** * Returns the derivation constraints of the type. */ - SchemaType::DerivationConstraints derivationConstraints() const; + SchemaType::DerivationConstraints derivationConstraints() const override; private: QXmlName m_name; diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h index e4a0b00..0c5ccdb 100644 --- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h @@ -87,24 +87,24 @@ namespace QPatternist */ virtual ~XsdValidatedXmlNodeModel(); - virtual QUrl baseUri(const QXmlNodeModelIndex &ni) const; - virtual QUrl documentUri(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const; - virtual QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const; - virtual QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const; - virtual QXmlName name(const QXmlNodeModelIndex &ni) const; - virtual QString stringValue(const QXmlNodeModelIndex &n) const; - virtual QVariant typedValue(const QXmlNodeModelIndex &n) const; - virtual QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const; - virtual QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const; - virtual QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const; - virtual QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const; - virtual bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const; - virtual void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const; - virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const; - virtual QXmlNodeModelIndex elementById(const QXmlName &NCName) const; - virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const; - virtual void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const; + QUrl baseUri(const QXmlNodeModelIndex &ni) const override; + QUrl documentUri(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const override; + QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override; + QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const override; + QXmlName name(const QXmlNodeModelIndex &ni) const override; + QString stringValue(const QXmlNodeModelIndex &n) const override; + QVariant typedValue(const QXmlNodeModelIndex &n) const override; + QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const override; + QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const override; + QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const override; + QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const override; + bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override; + void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const override; + QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const override; + QXmlNodeModelIndex elementById(const QXmlName &NCName) const override; + QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const override; + void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const override; /** * Sets the @p element that is assigned to the xml node at @p index. @@ -156,8 +156,8 @@ namespace QPatternist QSet<NamedSchemaComponent::Ptr> idIdRefBindings(const QString &id) const; protected: - virtual QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const; - virtual QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const; + QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const override; + QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const override; private: QExplicitlySharedDataPointer<const QAbstractXmlNodeModel> m_internalModel; diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h index 8623ee5..96df937 100644 --- a/src/xmlpatterns/schema/qxsdwildcard_p.h +++ b/src/xmlpatterns/schema/qxsdwildcard_p.h @@ -156,7 +156,7 @@ namespace QPatternist /** * Returns always @c true, used to avoid dynamic casts. */ - virtual bool isWildcard() const; + bool isWildcard() const override; /** * Sets the namespace @p constraint of the wildcard. diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h index 88d06e7..baf6aa4 100644 --- a/src/xmlpatterns/type/qitemtype_p.h +++ b/src/xmlpatterns/type/qitemtype_p.h @@ -51,13 +51,12 @@ #define Patternist_ItemType_H #include <QSharedData> +#include <qcontainerfwd.h> #include <QtXmlPatterns/private/qnamepool_p.h> QT_BEGIN_NAMESPACE -template<typename T> class QList; - namespace QPatternist { class Item; diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h index eae4665..bd3e715 100644 --- a/src/xmlpatterns/type/qschematype_p.h +++ b/src/xmlpatterns/type/qschematype_p.h @@ -53,9 +53,7 @@ #include <private/qnamepool_p.h> #include <private/qschemacomponent_p.h> #include <QXmlName> - -template<typename N, typename M> class QHash; -template<typename N> class QList; +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h index c6f6825..59492ac 100644 --- a/src/xmlpatterns/type/qsequencetype_p.h +++ b/src/xmlpatterns/type/qsequencetype_p.h @@ -50,9 +50,8 @@ #ifndef Patternist_SequenceType_H #define Patternist_SequenceType_H -template<typename T> class QList; - #include <QSharedData> +#include <qcontainerfwd.h> #include <private/qcardinality_p.h> #include <private/qitemtype_p.h> diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h index 35b608c..a62618a 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h @@ -74,10 +74,10 @@ namespace QPatternist DelegatingNamespaceResolver(const NamespaceResolver::Ptr &ns, const Bindings &overrides); - virtual void addBinding(const QXmlName nb); + void addBinding(const QXmlName nb) override; - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; - virtual Bindings bindings() const; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; + Bindings bindings() const override; private: const NamespaceResolver::Ptr m_nsResolver; diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h index 8ef0513..a6c0659 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h @@ -68,9 +68,9 @@ namespace QPatternist { public: GenericNamespaceResolver(const Bindings &list); - virtual void addBinding(const QXmlName nb); + void addBinding(const QXmlName nb) override; - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; /** * Returns a GenericNamespaceResolver containing the following bindings: @@ -92,7 +92,7 @@ namespace QPatternist */ static NamespaceResolver::Ptr defaultXSLTBindings(); - virtual Bindings bindings() const; + Bindings bindings() const override; private: /** diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h index 1348fe7..d74b563 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h @@ -71,9 +71,9 @@ namespace QPatternist public: NodeNamespaceResolver(const Item &item); - virtual void addBinding(const QXmlName nb); - virtual QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const; - virtual Bindings bindings() const; + void addBinding(const QXmlName nb) override; + QXmlName::NamespaceCode lookupNamespaceURI(const QXmlName::PrefixCode prefix) const override; + Bindings bindings() const override; private: const QXmlNodeModelIndex m_node; diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h index 4d1dfa3..a71a4fc 100644 --- a/src/xmlpatterns/utils/qoutputvalidator_p.h +++ b/src/xmlpatterns/utils/qoutputvalidator_p.h @@ -80,28 +80,28 @@ namespace QPatternist const SourceLocationReflection *const r, const bool isXSLT); - virtual void namespaceBinding(const QXmlName &nb); + void namespaceBinding(const QXmlName &nb) override; - virtual void characters(const QStringRef &value); - virtual void comment(const QString &value); + void characters(const QStringRef &value) override; + void comment(const QString &value) override; - virtual void startElement(const QXmlName &name); + void startElement(const QXmlName &name) override; - virtual void endElement(); + void endElement() override; - virtual void attribute(const QXmlName &name, - const QStringRef &value); + void attribute(const QXmlName &name, + const QStringRef &value) override; - virtual void processingInstruction(const QXmlName &name, - const QString &value); + void processingInstruction(const QXmlName &name, + const QString &value) override; - virtual void item(const Item &item); + void item(const Item &item) override; - virtual void startDocument(); - virtual void endDocument(); - virtual void atomicValue(const QVariant &value); - virtual void endOfSequence(); - virtual void startOfSequence(); + void startDocument() override; + void endDocument() override; + void atomicValue(const QVariant &value) override; + void endOfSequence() override; + void startOfSequence() override; private: bool m_hasReceivedChildren; diff --git a/tests/auto/qxmlquery/PushBaseliner.h b/tests/auto/qxmlquery/PushBaseliner.h index 37d89ae..5553b8b 100644 --- a/tests/auto/qxmlquery/PushBaseliner.h +++ b/tests/auto/qxmlquery/PushBaseliner.h @@ -80,62 +80,62 @@ bool PushBaseliner::isValid() const void PushBaseliner::startElement(const QXmlName &name) { - m_out << "startElement(" << name.toClarkName(m_namePool) << ')'<< endl; + m_out << "startElement(" << name.toClarkName(m_namePool) << ')'<< Qt::endl; } void PushBaseliner::endElement() { - m_out << "endElement()" << endl; + m_out << "endElement()" << Qt::endl; } void PushBaseliner::attribute(const QXmlName &name, const QStringRef &value) { - m_out << "attribute(" << name.toClarkName(m_namePool) << ", " << value.toString() << ')'<< endl; + m_out << "attribute(" << name.toClarkName(m_namePool) << ", " << value.toString() << ')'<< Qt::endl; } void PushBaseliner::comment(const QString &value) { - m_out << "comment(" << value << ')' << endl; + m_out << "comment(" << value << ')' << Qt::endl; } void PushBaseliner::characters(const QStringRef &value) { - m_out << "characters(" << value.toString() << ')' << endl; + m_out << "characters(" << value.toString() << ')' << Qt::endl; } void PushBaseliner::startDocument() { - m_out << "startDocument()" << endl; + m_out << "startDocument()" << Qt::endl; } void PushBaseliner::endDocument() { - m_out << "endDocument()" << endl; + m_out << "endDocument()" << Qt::endl; } void PushBaseliner::processingInstruction(const QXmlName &name, const QString &data) { - m_out << "processingInstruction(" << name.toClarkName(m_namePool) << ", " << data << ')' << endl; + m_out << "processingInstruction(" << name.toClarkName(m_namePool) << ", " << data << ')' << Qt::endl; } void PushBaseliner::atomicValue(const QVariant &val) { - m_out << "atomicValue(" << val.toString() << ')' << endl; + m_out << "atomicValue(" << val.toString() << ')' << Qt::endl; } void PushBaseliner::namespaceBinding(const QXmlName &name) { - m_out << "namespaceBinding(" << name.toClarkName(m_namePool) << ')' << endl; + m_out << "namespaceBinding(" << name.toClarkName(m_namePool) << ')' << Qt::endl; } void PushBaseliner::startOfSequence() { - m_out << "startOfSequence()" << endl; + m_out << "startOfSequence()" << Qt::endl; } void PushBaseliner::endOfSequence() { - m_out << "endOfSequence()" << endl; + m_out << "endOfSequence()" << Qt::endl; } #endif diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h index 96d8e40..a953f36 100644 --- a/tests/auto/xmlpatternssdk/ErrorHandler.h +++ b/tests/auto/xmlpatternssdk/ErrorHandler.h @@ -31,12 +31,11 @@ #include "Global.h" #include "qabstractmessagehandler.h" +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE -template<typename T> class QList; - namespace QPatternistSDK { /** diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h index eb62a69..ae04cc1 100644 --- a/tests/auto/xmlpatternssdk/TestBaseLine.h +++ b/tests/auto/xmlpatternssdk/TestBaseLine.h @@ -30,6 +30,7 @@ #define PatternistSDK_TestBaseLine_H #include <QString> +#include <qcontainerfwd.h> #include "Global.h" #include "TestResult.h" @@ -39,7 +40,6 @@ QT_BEGIN_NAMESPACE class QDomNamedNodeMap; class QDomNode; class QDomNodeList; -template<typename T> class QList; namespace QPatternistSDK { diff --git a/tests/auto/xmlpatternssdk/TreeItem.cpp b/tests/auto/xmlpatternssdk/TreeItem.cpp index 696693c..68803da 100644 --- a/tests/auto/xmlpatternssdk/TreeItem.cpp +++ b/tests/auto/xmlpatternssdk/TreeItem.cpp @@ -30,6 +30,8 @@ #include "TreeItem.h" +#include <limits.h> + using namespace QPatternistSDK; int TreeItem::row() const diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h index 276f13a..8c91185 100644 --- a/tests/auto/xmlpatternssdk/TreeItem.h +++ b/tests/auto/xmlpatternssdk/TreeItem.h @@ -30,13 +30,13 @@ #define PatternistSDK_TreeItem_H #include <QObject> +#include <qcontainerfwd.h> #include "Global.h" QT_BEGIN_NAMESPACE class QVariant; -template<typename T> class QList; template<typename T> class QPointer; namespace QPatternistSDK diff --git a/tests/auto/xmlpatternsview/view/MainWindow.cpp b/tests/auto/xmlpatternsview/view/MainWindow.cpp index b0066ff..1c28d81 100644 --- a/tests/auto/xmlpatternsview/view/MainWindow.cpp +++ b/tests/auto/xmlpatternsview/view/MainWindow.cpp @@ -487,7 +487,7 @@ void MainWindow::on_actionRestart_triggered() else { QTextStream err(stderr); - err << "Failed to start " << qPrintable(QCoreApplication::applicationFilePath()) << endl; + err << "Failed to start " << qPrintable(QCoreApplication::applicationFilePath()) << Qt::endl; } } diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index 1c6f3cc..1e74227 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -109,8 +109,8 @@ public: #endif protected: - virtual QVariant convertToValue(const QApplicationArgument &arg, - const QString &input) const + QVariant convertToValue(const QApplicationArgument &arg, + const QString &input) const override { if(arg.name() == QLatin1String("param")) { @@ -161,7 +161,7 @@ protected: return QApplicationArgumentParser::convertToValue(arg, input); } - virtual QString typeToName(const QApplicationArgument &argument) const + QString typeToName(const QApplicationArgument &argument) const override { if(argument.name() == QLatin1String("param")) return QLatin1String("name=value"); @@ -171,7 +171,7 @@ protected: return QApplicationArgumentParser::typeToName(argument); } - virtual QVariant defaultValue(const QApplicationArgument &argument) const + QVariant defaultValue(const QApplicationArgument &argument) const override { if(argument.name() == QLatin1String("output")) { diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h index 9ad9751..819069d 100644 --- a/tools/xmlpatterns/qapplicationargumentparser_p.h +++ b/tools/xmlpatterns/qapplicationargumentparser_p.h @@ -40,15 +40,13 @@ #define QApplicationArgumentParser_H #include <QtCore/QVariant> /* Needed, because we can't forward declare QVariantList. */ +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE class QApplicationArgument; class QApplicationArgumentParserPrivate; class QStringList; -template<typename A, typename B> struct QPair; -template<typename T> class QList; -template<typename Value> class QList; class QApplicationArgumentParser { |