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 /src/xmlpatterns/parser | |
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>
Diffstat (limited to 'src/xmlpatterns/parser')
-rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 6 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qtokenrevealer_p.h | 8 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qxquerytokenizer_p.h | 8 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qxslttokenizer_p.h | 14 |
4 files changed, 18 insertions, 18 deletions
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; |