summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/schema
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/schema')
-rw-r--r--src/xmlpatterns/schema/qxsdattributereference_p.h4
-rw-r--r--src/xmlpatterns/schema/qxsdattributeuse_p.h2
-rw-r--r--src/xmlpatterns/schema/qxsdcomplextype_p.h12
-rw-r--r--src/xmlpatterns/schema/qxsdelement_p.h2
-rw-r--r--src/xmlpatterns/schema/qxsdmodelgroup_p.h5
-rw-r--r--src/xmlpatterns/schema/qxsdreference_p.h2
-rw-r--r--src/xmlpatterns/schema/qxsdschemacontext_p.h8
-rw-r--r--src/xmlpatterns/schema/qxsdschemaparser_p.h4
-rw-r--r--src/xmlpatterns/schema/qxsdschematypesfactory_p.h4
-rw-r--r--src/xmlpatterns/schema/qxsdsimpletype_p.h10
-rw-r--r--src/xmlpatterns/schema/qxsdtypechecker_p.h4
-rw-r--r--src/xmlpatterns/schema/qxsduserschematype_p.h10
-rw-r--r--src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h40
-rw-r--r--src/xmlpatterns/schema/qxsdwildcard_p.h2
14 files changed, 53 insertions, 56 deletions
diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h
index 544841d..493866a 100644
--- a/src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/src/xmlpatterns/schema/qxsdattributereference_p.h
@@ -90,12 +90,12 @@ namespace QPatternist
/**
* Always returns false, used to avoid dynamic casts.
*/
- virtual bool isAttributeUse() const;
+ bool isAttributeUse() const override;
/**
* Always returns true, used to avoid dynamic casts.
*/
- virtual bool isReference() const;
+ bool isReference() const override;
/**
* Sets the @p type of the attribute reference.
diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index 3559f7c..1d2ccce 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h
@@ -158,7 +158,7 @@ namespace QPatternist
/**
* Always returns true, used to avoid dynamic casts.
*/
- virtual bool isAttributeUse() const;
+ bool isAttributeUse() const override;
/**
* Sets the use @p type of the attribute use.
diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index 1e7a027..0059d08 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h
@@ -242,7 +242,7 @@ namespace QPatternist
*
* @param namePool The name pool where the type name is stored in.
*/
- virtual QString displayName(const NamePool::Ptr &namePool) const;
+ QString displayName(const NamePool::Ptr &namePool) const override;
/**
* Sets the base type of the complex type.
@@ -254,7 +254,7 @@ namespace QPatternist
/**
* Returns the base type of the complex type.
*/
- virtual SchemaType::Ptr wxsSuperType() const;
+ SchemaType::Ptr wxsSuperType() const override;
/**
* Sets the context @p component of the complex type.
@@ -282,7 +282,7 @@ namespace QPatternist
/**
* Returns the derivation method of the complex type.
*/
- virtual DerivationMethod derivationMethod() const;
+ DerivationMethod derivationMethod() const override;
/**
* Sets whether the complex type is @p abstract.
@@ -294,7 +294,7 @@ namespace QPatternist
/**
* Returns whether the complex type is abstract.
*/
- virtual bool isAbstract() const;
+ bool isAbstract() const override;
/**
* Sets the list of all attribute @p uses of the complex type.
@@ -328,7 +328,7 @@ namespace QPatternist
/**
* Always returns SchemaType::ComplexType
*/
- virtual TypeCategory category() const;
+ TypeCategory category() const override;
/**
* Sets the content @p type of the complex type.
@@ -378,7 +378,7 @@ namespace QPatternist
/**
* Always returns @c true.
*/
- virtual bool isDefinedBySchema() const;
+ bool isDefinedBySchema() const override;
private:
SchemaType::Ptr m_superType;
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index 12dd12d..d271644 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -236,7 +236,7 @@ namespace QPatternist
/**
* Always returns @c true, used to avoid dynamic casts.
*/
- virtual bool isElement() const;
+ bool isElement() const override;
/**
* Sets the @p type of the element.
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index 3d07a63..22073bf 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@ -52,11 +52,10 @@
#include <private/qxsdparticle_p.h>
#include <private/qxsdterm_p.h>
+#include <qcontainerfwd.h>
QT_BEGIN_NAMESPACE
-template<typename N> class QList;
-
namespace QPatternist
{
/**
@@ -96,7 +95,7 @@ namespace QPatternist
/**
* Returns always @c true, used to avoid dynamic casts.
*/
- virtual bool isModelGroup() const;
+ bool isModelGroup() const override;
/**
* Sets the @p compositor of the model group.
diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h
index 4372978..e1a4b03 100644
--- a/src/xmlpatterns/schema/qxsdreference_p.h
+++ b/src/xmlpatterns/schema/qxsdreference_p.h
@@ -90,7 +90,7 @@ namespace QPatternist
/**
* Returns always @c true, used to avoid dynamic casts.
*/
- virtual bool isReference() const;
+ bool isReference() const override;
/**
* Sets the @p type of the reference.
diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index 0f11979..b102472 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h
@@ -94,7 +94,7 @@ namespace QPatternist
/**
* Returns the name pool of the schema context.
*/
- virtual NamePool::Ptr namePool() const;
+ NamePool::Ptr namePool() const override;
/**
* Sets the base URI for the main schema.
@@ -130,12 +130,12 @@ namespace QPatternist
* Returns the message handler used by the context for
* error reporting.
*/
- virtual QAbstractMessageHandler* messageHandler() const;
+ QAbstractMessageHandler* messageHandler() const override;
/**
* Always returns an empty source location.
*/
- virtual QSourceLocation locationFor(const SourceLocationReflection *const reflection) const;
+ QSourceLocation locationFor(const SourceLocationReflection *const reflection) const override;
/**
* Sets the uri @p resolver that is used for resolving URIs in the
@@ -147,7 +147,7 @@ namespace QPatternist
* Returns the uri resolver that is used for resolving URIs in the
* schema parser.
*/
- virtual const QAbstractUriResolver* uriResolver() const;
+ const QAbstractUriResolver* uriResolver() const override;
/**
* Returns the list of facets for the given simple @p type.
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index 8095ceb..a8b8da6 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h
@@ -164,12 +164,12 @@ namespace QPatternist
/**
* Returns the document URI of the schema to parse.
*/
- QUrl documentURI() const;
+ QUrl documentURI() const override;
/**
* Reimplemented from MaintainingReader, always returns @c false.
*/
- bool isAnyAttributeAllowed() const;
+ bool isAnyAttributeAllowed() const override;
private:
/**
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index 4d14484..12b3de4 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@ -80,12 +80,12 @@ namespace QPatternist
*
* @note This does not handle user defined types, only builtin types.
*/
- virtual SchemaType::Ptr createSchemaType(const QXmlName) const;
+ SchemaType::Ptr createSchemaType(const QXmlName) const override;
/**
* Returns a hash of all available types.
*/
- virtual SchemaType::Hash types() const;
+ SchemaType::Hash types() const override;
private:
/**
diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index 7b1a2ea..c0ab9f7 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h
@@ -83,7 +83,7 @@ namespace QPatternist
*
* @param namePool The name pool the type name is stored in.
*/
- virtual QString displayName(const NamePool::Ptr &namePool) const;
+ QString displayName(const NamePool::Ptr &namePool) const override;
/**
* Sets the base @p type of the simple type.
@@ -96,7 +96,7 @@ namespace QPatternist
* Returns the base type of the simple type or an empty pointer if no base type is
* set.
*/
- virtual SchemaType::Ptr wxsSuperType() const;
+ SchemaType::Ptr wxsSuperType() const override;
/**
* Sets the context @p component of the simple type.
@@ -177,7 +177,7 @@ namespace QPatternist
/**
* Returns the category (variety) of the simple type.
*/
- virtual TypeCategory category() const;
+ TypeCategory category() const override;
/**
* Sets the derivation @p method of the simple type.
@@ -189,12 +189,12 @@ namespace QPatternist
/**
* Returns the derivation method of the simple type.
*/
- virtual DerivationMethod derivationMethod() const;
+ DerivationMethod derivationMethod() const override;
/**
* Always returns @c true.
*/
- virtual bool isDefinedBySchema() const;
+ bool isDefinedBySchema() const override;
private:
SchemaType::Ptr m_superType;
diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index 3fd6efa..9dcbf6f 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h
@@ -73,8 +73,8 @@ namespace QPatternist
public:
XsdSchemaSourceLocationReflection(const QSourceLocation &location);
- virtual const SourceLocationReflection *actualReflection() const;
- virtual QSourceLocation sourceLocation() const;
+ const SourceLocationReflection *actualReflection() const override;
+ QSourceLocation sourceLocation() const override;
private:
const QSourceLocation m_sourceLocation;
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index cf1841c..f98b2ae 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -53,12 +53,10 @@
#include <private/qnamedschemacomponent_p.h>
#include <private/qschematype_p.h>
#include <private/qxsdannotated_p.h>
+#include <qcontainerfwd.h>
QT_BEGIN_NAMESPACE
-template<typename N, typename M> class QHash;
-template<typename N> class QList;
-
namespace QPatternist
{
/**
@@ -86,14 +84,14 @@ namespace QPatternist
*
* @param namePool The pool the name belongs to.
*/
- virtual QXmlName name(const NamePool::Ptr &namePool) const;
+ QXmlName name(const NamePool::Ptr &namePool) const override;
/**
* Returns the display name of the type.
*
* @param namePool The pool the name belongs to.
*/
- virtual QString displayName(const NamePool::Ptr &namePool) const;
+ QString displayName(const NamePool::Ptr &namePool) const override;
/**
* Sets the derivation @p constraints of the type.
@@ -103,7 +101,7 @@ namespace QPatternist
/**
* Returns the derivation constraints of the type.
*/
- SchemaType::DerivationConstraints derivationConstraints() const;
+ SchemaType::DerivationConstraints derivationConstraints() const override;
private:
QXmlName m_name;
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index e4a0b00..0c5ccdb 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@ -87,24 +87,24 @@ namespace QPatternist
*/
virtual ~XsdValidatedXmlNodeModel();
- virtual QUrl baseUri(const QXmlNodeModelIndex &ni) const;
- virtual QUrl documentUri(const QXmlNodeModelIndex &ni) const;
- virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const;
- virtual QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const;
- virtual QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const;
- virtual QXmlName name(const QXmlNodeModelIndex &ni) const;
- virtual QString stringValue(const QXmlNodeModelIndex &n) const;
- virtual QVariant typedValue(const QXmlNodeModelIndex &n) const;
- virtual QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const;
- virtual QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const;
- virtual QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const;
- virtual QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const;
- virtual bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const;
- virtual void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const;
- virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const;
- virtual QXmlNodeModelIndex elementById(const QXmlName &NCName) const;
- virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const;
- virtual void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const;
+ QUrl baseUri(const QXmlNodeModelIndex &ni) const override;
+ QUrl documentUri(const QXmlNodeModelIndex &ni) const override;
+ QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &ni) const override;
+ QXmlNodeModelIndex::DocumentOrder compareOrder(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override;
+ QXmlNodeModelIndex root(const QXmlNodeModelIndex &n) const override;
+ QXmlName name(const QXmlNodeModelIndex &ni) const override;
+ QString stringValue(const QXmlNodeModelIndex &n) const override;
+ QVariant typedValue(const QXmlNodeModelIndex &n) const override;
+ QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > iterate(const QXmlNodeModelIndex &ni, QXmlNodeModelIndex::Axis axis) const override;
+ QPatternist::ItemIteratorPtr sequencedTypedValue(const QXmlNodeModelIndex &ni) const override;
+ QPatternist::ItemTypePtr type(const QXmlNodeModelIndex &ni) const override;
+ QXmlName::NamespaceCode namespaceForPrefix(const QXmlNodeModelIndex &ni, const QXmlName::PrefixCode prefix) const override;
+ bool isDeepEqual(const QXmlNodeModelIndex &ni1, const QXmlNodeModelIndex &ni2) const override;
+ void sendNamespaces(const QXmlNodeModelIndex &n, QAbstractXmlReceiver *const receiver) const override;
+ QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex &n) const override;
+ QXmlNodeModelIndex elementById(const QXmlName &NCName) const override;
+ QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &NCName) const override;
+ void copyNodeTo(const QXmlNodeModelIndex &node, QAbstractXmlReceiver *const receiver, const NodeCopySettings &) const override;
/**
* Sets the @p element that is assigned to the xml node at @p index.
@@ -156,8 +156,8 @@ namespace QPatternist
QSet<NamedSchemaComponent::Ptr> idIdRefBindings(const QString &id) const;
protected:
- virtual QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const;
- virtual QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const;
+ QXmlNodeModelIndex nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &origin) const override;
+ QVector<QXmlNodeModelIndex> attributes(const QXmlNodeModelIndex &element) const override;
private:
QExplicitlySharedDataPointer<const QAbstractXmlNodeModel> m_internalModel;
diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h
index 8623ee5..96df937 100644
--- a/src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/src/xmlpatterns/schema/qxsdwildcard_p.h
@@ -156,7 +156,7 @@ namespace QPatternist
/**
* Returns always @c true, used to avoid dynamic casts.
*/
- virtual bool isWildcard() const;
+ bool isWildcard() const override;
/**
* Sets the namespace @p constraint of the wildcard.
View Lorry Controller Status