summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/xmlpatterns/api/qabstractxmlforwarditerator_p.h12
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.cpp2
-rw-r--r--src/xmlpatterns/api/qcoloringmessagehandler_p.h8
-rw-r--r--src/xmlpatterns/api/qiodevicedelegate_p.h30
-rw-r--r--src/xmlpatterns/api/qpullbridge_p.h14
-rw-r--r--src/xmlpatterns/api/qresourcedelegator_p.h28
-rw-r--r--src/xmlpatterns/api/qsimplexmlnodemodel.h10
-rw-r--r--src/xmlpatterns/api/quriloader_p.h6
-rw-r--r--src/xmlpatterns/api/qvariableloader.cpp2
-rw-r--r--src/xmlpatterns/api/qvariableloader_p.h12
-rw-r--r--src/xmlpatterns/api/qxmlformatter.h28
-rw-r--r--src/xmlpatterns/api/qxmlserializer.h30
12 files changed, 91 insertions, 91 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
index 5ec6dc1..9071a8b 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
@@ -134,7 +134,7 @@ namespace QPatternist
friend class DeduplicateIterator;
public:
- virtual OutputType next()
+ OutputType next() override
{
if(m_position == -1)
return OutputType();
@@ -151,22 +151,22 @@ namespace QPatternist
return m_current;
}
- virtual OutputType current() const
+ OutputType current() const override
{
return m_current;
}
- virtual qint64 position() const
+ qint64 position() const override
{
return m_position;
}
- virtual qint64 count()
+ qint64 count() override
{
return m_list.count();
}
- virtual typename QAbstractXmlForwardIterator<OutputType>::Ptr copy() const
+ typename QAbstractXmlForwardIterator<OutputType>::Ptr copy() const override
{
return QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<OutputType> >(new ListIteratorPlatform<InputType, OutputType, Derived, ListType>(m_list));
}
@@ -218,7 +218,7 @@ namespace QPatternist
{
}
- virtual QList<T> toList()
+ QList<T> toList() override
{
return toList(m_list);
}
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
index b574427..b8fb0c7 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
@@ -480,7 +480,7 @@ namespace QPatternist
{
}
- virtual QAbstractXmlForwardIterator<QXmlNodeModelIndexIteratorPointer>::Ptr copy() const
+ QAbstractXmlForwardIterator<QXmlNodeModelIndexIteratorPointer>::Ptr copy() const override
{
ItVector result;
const int count = m_list.count();
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index 56f1b11..998272c 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@ -66,10 +66,10 @@ namespace QPatternist
ColoringMessageHandler(QObject *parent = 0);
protected:
- virtual void handleMessage(QtMsgType type,
- const QString &description,
- const QUrl &identifier,
- const QSourceLocation &sourceLocation);
+ void handleMessage(QtMsgType type,
+ const QString &description,
+ const QUrl &identifier,
+ const QSourceLocation &sourceLocation) override;
private:
QString colorifyDescription(const QString &in) const;
diff --git a/src/xmlpatterns/api/qiodevicedelegate_p.h b/src/xmlpatterns/api/qiodevicedelegate_p.h
index bf6e9cb..8a58f15 100644
--- a/src/xmlpatterns/api/qiodevicedelegate_p.h
+++ b/src/xmlpatterns/api/qiodevicedelegate_p.h
@@ -66,24 +66,24 @@ namespace QPatternist
public:
QIODeviceDelegate(QIODevice *const source);
- virtual void abort();
+ void abort() override;
- virtual bool atEnd() const;
- virtual qint64 bytesAvailable() const;
- virtual qint64 bytesToWrite() const;
- virtual bool canReadLine() const;
- virtual void close();
- virtual bool isSequential() const;
- virtual bool open(OpenMode mode);
- virtual qint64 pos() const;
- virtual bool reset();
- virtual bool seek(qint64 pos);
- virtual qint64 size() const;
- virtual bool waitForBytesWritten(int msecs);
- virtual bool waitForReadyRead(int msecs);
+ bool atEnd() const override;
+ qint64 bytesAvailable() const override;
+ qint64 bytesToWrite() const override;
+ bool canReadLine() const override;
+ void close() override;
+ bool isSequential() const override;
+ bool open(OpenMode mode) override;
+ qint64 pos() const override;
+ bool reset() override;
+ bool seek(qint64 pos) override;
+ qint64 size() const override;
+ bool waitForBytesWritten(int msecs) override;
+ bool waitForReadyRead(int msecs) override;
protected:
- virtual qint64 readData(char *data, qint64 maxSize);
+ qint64 readData(char *data, qint64 maxSize) override;
private Q_SLOTS:
void networkTimeout();
diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h
index 1beac55..5c842d3 100644
--- a/src/xmlpatterns/api/qpullbridge_p.h
+++ b/src/xmlpatterns/api/qpullbridge_p.h
@@ -70,16 +70,16 @@ namespace QPatternist
m_iterators.push(qMakePair(StartOfInput, it));
}
- virtual Event next();
- virtual Event current() const;
- virtual QXmlName name() const;
+ Event next() override;
+ Event current() const override;
+ QXmlName name() const override;
/**
* Returns always an empty QVariant.
*/
- virtual QVariant atomicValue() const;
- virtual QString stringValue() const;
- virtual QHash<QXmlName, QString> attributes();
- virtual QHash<QXmlName, QXmlItem> attributeItems();
+ QVariant atomicValue() const override;
+ QString stringValue() const override;
+ QHash<QXmlName, QString> attributes() override;
+ QHash<QXmlName, QXmlItem> attributeItems() override;
QXmlNodeModelIndex index() const;
QSourceLocation sourceLocation() const;
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index c83a549..5bbfb34 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -83,25 +83,25 @@ namespace QPatternist
Q_ASSERT(m_parentLoader);
}
- virtual bool isUnparsedTextAvailable(const QUrl &uri,
- const QString &encoding);
- virtual ItemType::Ptr announceUnparsedText(const QUrl &uri);
- virtual Item openUnparsedText(const QUrl &uri,
- const QString &encoding,
- const ReportContext::Ptr &context,
- const SourceLocationReflection *const where);
- virtual Item openDocument(const QUrl &uri,
- const ReportContext::Ptr &context);
- virtual SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint);
- virtual bool isDocumentAvailable(const QUrl &uri);
- virtual Item::Iterator::Ptr openCollection(const QUrl &uri);
- virtual SequenceType::Ptr announceCollection(const QUrl &uri);
+ bool isUnparsedTextAvailable(const QUrl &uri,
+ const QString &encoding) override;
+ ItemType::Ptr announceUnparsedText(const QUrl &uri) override;
+ Item openUnparsedText(const QUrl &uri,
+ const QString &encoding,
+ const ReportContext::Ptr &context,
+ const SourceLocationReflection *const where) override;
+ Item openDocument(const QUrl &uri,
+ const ReportContext::Ptr &context) override;
+ SequenceType::Ptr announceDocument(const QUrl &uri, const Usage usageHint) override;
+ bool isDocumentAvailable(const QUrl &uri) override;
+ Item::Iterator::Ptr openCollection(const QUrl &uri) override;
+ SequenceType::Ptr announceCollection(const QUrl &uri) override;
/**
* Returns the union of the deviceURIs() that ResourceDelegator's two
* resource loaders has.
*/
- virtual QSet<QUrl> deviceURIs() const;
+ QSet<QUrl> deviceURIs() const override;
private:
const QSet<QUrl> m_needsOverride;
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 3389835..2a3ae34 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -54,12 +54,12 @@ public:
QSimpleXmlNodeModel(const QXmlNamePool &namePool);
virtual ~QSimpleXmlNodeModel();
- virtual QUrl baseUri(const QXmlNodeModelIndex &node) const;
+ QUrl baseUri(const QXmlNodeModelIndex &node) const override;
QXmlNamePool &namePool() const;
- virtual QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex&) const;
- virtual QString stringValue(const QXmlNodeModelIndex &node) const;
- virtual QXmlNodeModelIndex elementById(const QXmlName &id) const;
- virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const;
+ QVector<QXmlName> namespaceBindings(const QXmlNodeModelIndex&) const override;
+ QString stringValue(const QXmlNodeModelIndex &node) const override;
+ QXmlNodeModelIndex elementById(const QXmlName &id) const override;
+ QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const override;
private:
Q_DECLARE_PRIVATE(QSimpleXmlNodeModel)
diff --git a/src/xmlpatterns/api/quriloader_p.h b/src/xmlpatterns/api/quriloader_p.h
index 4bf4e2b..69143f6 100644
--- a/src/xmlpatterns/api/quriloader_p.h
+++ b/src/xmlpatterns/api/quriloader_p.h
@@ -67,9 +67,9 @@ namespace QPatternist
const NamePool::Ptr &np,
const VariableLoader::Ptr &variableLoader);
- virtual QNetworkReply *createRequest(Operation op,
- const QNetworkRequest & req,
- QIODevice *outgoingData = 0);
+ QNetworkReply *createRequest(Operation op,
+ const QNetworkRequest & req,
+ QIODevice *outgoingData = 0) override;
private:
const QString m_variableNS;
diff --git a/src/xmlpatterns/api/qvariableloader.cpp b/src/xmlpatterns/api/qvariableloader.cpp
index 2bca720..69ae7e7 100644
--- a/src/xmlpatterns/api/qvariableloader.cpp
+++ b/src/xmlpatterns/api/qvariableloader.cpp
@@ -104,7 +104,7 @@ namespace QPatternist
Q_ASSERT(m_modelStorage);
}
- virtual void addNodeModel(const QAbstractXmlNodeModel::Ptr &nodeModel)
+ void addNodeModel(const QAbstractXmlNodeModel::Ptr &nodeModel) override
{
m_modelStorage->addNodeModel(nodeModel);
}
diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h
index c190171..1e0df96 100644
--- a/src/xmlpatterns/api/qvariableloader_p.h
+++ b/src/xmlpatterns/api/qvariableloader_p.h
@@ -74,13 +74,13 @@ namespace QPatternist
{
}
- virtual QPatternist::SequenceType::Ptr announceExternalVariable(const QXmlName name,
- const QPatternist::SequenceType::Ptr &declaredType);
- virtual QPatternist::Item::Iterator::Ptr evaluateSequence(const QXmlName name,
- const QPatternist::DynamicContext::Ptr &);
+ QPatternist::SequenceType::Ptr announceExternalVariable(const QXmlName name,
+ const QPatternist::SequenceType::Ptr &declaredType) override;
+ QPatternist::Item::Iterator::Ptr evaluateSequence(const QXmlName name,
+ const QPatternist::DynamicContext::Ptr &) override;
- virtual QPatternist::Item evaluateSingleton(const QXmlName name,
- const QPatternist::DynamicContext::Ptr &);
+ QPatternist::Item evaluateSingleton(const QXmlName name,
+ const QPatternist::DynamicContext::Ptr &) override;
void removeBinding(const QXmlName &name);
bool hasBinding(const QXmlName &name) const;
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 87beb48..51506ac 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -56,27 +56,27 @@ public:
QXmlFormatter(const QXmlQuery &query,
QIODevice *outputDevice);
- virtual void characters(const QStringRef &value);
- virtual void comment(const QString &value);
- virtual void startElement(const QXmlName &name);
- virtual void endElement();
+ void characters(const QStringRef &value) override;
+ void comment(const QString &value) override;
+ void startElement(const QXmlName &name) override;
+ void endElement() override;
- virtual void attribute(const QXmlName &name,
- const QStringRef &value);
- virtual void processingInstruction(const QXmlName &name,
- const QString &value);
- virtual void atomicValue(const QVariant &value);
- virtual void startDocument();
- virtual void endDocument();
- virtual void startOfSequence();
- virtual void endOfSequence();
+ void attribute(const QXmlName &name,
+ const QStringRef &value) override;
+ void processingInstruction(const QXmlName &name,
+ const QString &value) override;
+ void atomicValue(const QVariant &value) override;
+ void startDocument() override;
+ void endDocument() override;
+ void startOfSequence() override;
+ void endOfSequence() override;
int indentationDepth() const;
void setIndentationDepth(int depth);
/* The members below are internal, not part of the public API, and
* unsupported. Using them leads to undefined behavior. */
- virtual void item(const QPatternist::Item &item);
+ void item(const QPatternist::Item &item) override;
private:
inline void startFormattingContent();
Q_DECLARE_PRIVATE(QXmlFormatter)
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 9f6ce18..b236534 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -56,27 +56,27 @@ public:
QXmlSerializer(const QXmlQuery &query,
QIODevice *outputDevice);
- 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 atomicValue(const QVariant &value);
+ void atomicValue(const QVariant &value) override;
- virtual void startDocument();
- virtual void endDocument();
- virtual void startOfSequence();
- virtual void endOfSequence();
+ void startDocument() override;
+ void endDocument() override;
+ void startOfSequence() override;
+ void endOfSequence() override;
QIODevice *outputDevice() const;
@@ -85,7 +85,7 @@ public:
/* The members below are internal, not part of the public API, and
* unsupported. Using them leads to undefined behavior. */
- virtual void item(const QPatternist::Item &item);
+ void item(const QPatternist::Item &item) override;
protected:
QXmlSerializer(QAbstractXmlReceiverPrivate *d);
View Lorry Controller Status