diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-08 22:58:46 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2019-10-03 13:14:25 +0300 |
| commit | 8cb90345a6d3a5e686d471792e159c014566404d (patch) | |
| tree | 50c62df01e5cbb74feb2b5d655d86dd01a6ab1e4 | |
| parent | 4f651f10c19fc140d8560aba8ca044fff650904f (diff) | |
| download | qtxmlpatterns-8cb90345a6d3a5e686d471792e159c014566404d.tar.gz | |
Add missing override and remove redundant virtual
Change-Id: I1a2974e012a45eb5145a092c9014d8eaab9f3ce7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
67 files changed, 473 insertions, 473 deletions
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/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/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..02953ac 100644 --- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h +++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h @@ -96,7 +96,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..f7911c8 100644 --- a/src/xmlpatterns/schema/qxsduserschematype_p.h +++ b/src/xmlpatterns/schema/qxsduserschematype_p.h @@ -86,14 +86,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 +103,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/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/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")) { |