summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/acceltree
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/acceltree')
-rw-r--r--src/xmlpatterns/acceltree/qacceliterators_p.h32
-rw-r--r--src/xmlpatterns/acceltree/qacceltree.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceltree_p.h48
-rw-r--r--src/xmlpatterns/acceltree/qacceltreebuilder_p.h40
-rw-r--r--src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h24
5 files changed, 73 insertions, 73 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,
View Lorry Controller Status