From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/xml/dom/qdom.cpp | 120 +++++++++++++++++++++++++-------------------------- src/xml/sax/qxml.cpp | 4 +- src/xml/sax/qxml.h | 114 ++++++++++++++++++++++++------------------------ 3 files changed, 119 insertions(+), 119 deletions(-) (limited to 'src/xml') diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 9affd697a0..df2d7c3ce8 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -291,16 +291,16 @@ public: void init(); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNodePrivate* insertBefore(QDomNodePrivate* newChild, QDomNodePrivate* refChild) Q_DECL_OVERRIDE; - QDomNodePrivate* insertAfter(QDomNodePrivate* newChild, QDomNodePrivate* refChild) Q_DECL_OVERRIDE; - QDomNodePrivate* replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild) Q_DECL_OVERRIDE; - QDomNodePrivate* removeChild(QDomNodePrivate* oldChild) Q_DECL_OVERRIDE; - QDomNodePrivate* appendChild(QDomNodePrivate* newChild) Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNodePrivate* insertBefore(QDomNodePrivate* newChild, QDomNodePrivate* refChild) override; + QDomNodePrivate* insertAfter(QDomNodePrivate* newChild, QDomNodePrivate* refChild) override; + QDomNodePrivate* replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild) override; + QDomNodePrivate* removeChild(QDomNodePrivate* oldChild) override; + QDomNodePrivate* appendChild(QDomNodePrivate* newChild) override; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentTypeNode; } + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentTypeNode; } - void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + void save(QTextStream& s, int, int) const override; // Variables QDomNamedNodeMapPrivate* entities; @@ -317,8 +317,8 @@ public: QDomDocumentFragmentPrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - virtual QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentFragmentNode; } + virtual QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentFragmentNode; } }; class QDomCharacterDataPrivate : public QDomNodePrivate @@ -335,8 +335,8 @@ public: void replaceData(unsigned long offset, unsigned long count, const QString& arg); // Reimplemented from QDomNodePrivate - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CharacterDataNode; } - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const override { return QDomNode::CharacterDataNode; } + QDomNodePrivate* cloneNode(bool deep = true) override; }; class QDomTextPrivate : public QDomCharacterDataPrivate @@ -348,9 +348,9 @@ public: QDomTextPrivate* splitText(int offset); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::TextNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::TextNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomAttrPrivate : public QDomNodePrivate @@ -363,10 +363,10 @@ public: bool specified() const; // Reimplemented from QDomNodePrivate - void setNodeValue(const QString& v) Q_DECL_OVERRIDE; - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::AttributeNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + void setNodeValue(const QString& v) override; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::AttributeNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables bool m_specified; @@ -398,9 +398,9 @@ public: // Reimplemented from QDomNodePrivate QDomNamedNodeMapPrivate* attributes() { return m_attr; } bool hasAttributes() { return (m_attr->length() > 0); } - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::ElementNode; } - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const override { return QDomNode::ElementNode; } + QDomNodePrivate* cloneNode(bool deep = true) override; + virtual void save(QTextStream& s, int, int) const override; // Variables QDomNamedNodeMapPrivate* m_attr; @@ -414,9 +414,9 @@ public: QDomCommentPrivate(QDomCommentPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CommentNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::CommentNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomCDATASectionPrivate : public QDomTextPrivate @@ -426,9 +426,9 @@ public: QDomCDATASectionPrivate(QDomCDATASectionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CDATASectionNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::CDATASectionNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomNotationPrivate : public QDomNodePrivate @@ -439,9 +439,9 @@ public: QDomNotationPrivate(QDomNotationPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::NotationNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::NotationNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables QString m_sys; @@ -456,9 +456,9 @@ public: QDomEntityPrivate(QDomEntityPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::EntityNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::EntityNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables QString m_sys; @@ -473,9 +473,9 @@ public: QDomEntityReferencePrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::EntityReferenceNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::EntityReferenceNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomProcessingInstructionPrivate : public QDomNodePrivate @@ -486,9 +486,9 @@ public: QDomProcessingInstructionPrivate(QDomProcessingInstructionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::ProcessingInstructionNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::ProcessingInstructionNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomDocumentPrivate : public QDomNodePrivate @@ -523,9 +523,9 @@ public: QDomNodePrivate* importNode(QDomNodePrivate* importedNode, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentNode; } - void clear() Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentNode; } + void clear() override; // Variables QExplicitlySharedDataPointer impl; @@ -576,32 +576,32 @@ public: ~QDomHandler(); // content handler - bool endDocument() Q_DECL_OVERRIDE; - bool startElement(const QString& nsURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) Q_DECL_OVERRIDE; - bool endElement(const QString& nsURI, const QString& localName, const QString& qName) Q_DECL_OVERRIDE; - bool characters(const QString& ch) Q_DECL_OVERRIDE; - bool processingInstruction(const QString& target, const QString& data) Q_DECL_OVERRIDE; - bool skippedEntity(const QString& name) Q_DECL_OVERRIDE; + bool endDocument() override; + bool startElement(const QString& nsURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) override; + bool endElement(const QString& nsURI, const QString& localName, const QString& qName) override; + bool characters(const QString& ch) override; + bool processingInstruction(const QString& target, const QString& data) override; + bool skippedEntity(const QString& name) override; // error handler - bool fatalError(const QXmlParseException& exception) Q_DECL_OVERRIDE; + bool fatalError(const QXmlParseException& exception) override; // lexical handler - bool startCDATA() Q_DECL_OVERRIDE; - bool endCDATA() Q_DECL_OVERRIDE; - bool startEntity(const QString &) Q_DECL_OVERRIDE; - bool endEntity(const QString &) Q_DECL_OVERRIDE; - bool startDTD(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool comment(const QString& ch) Q_DECL_OVERRIDE; + bool startCDATA() override; + bool endCDATA() override; + bool startEntity(const QString &) override; + bool endEntity(const QString &) override; + bool startDTD(const QString& name, const QString& publicId, const QString& systemId) override; + bool comment(const QString& ch) override; // decl handler - bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) Q_DECL_OVERRIDE ; + bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) override ; // DTD handler - bool notationDecl(const QString & name, const QString & publicId, const QString & systemId) Q_DECL_OVERRIDE; - bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString ¬ationName) Q_DECL_OVERRIDE ; + bool notationDecl(const QString & name, const QString & publicId, const QString & systemId) override; + bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString ¬ationName) override ; - void setDocumentLocator(QXmlLocator *locator) Q_DECL_OVERRIDE; + void setDocumentLocator(QXmlLocator *locator) override; QString errorMsg; int errorLine; diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index bc7d00483a..8615d9b10c 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -448,11 +448,11 @@ public: { } - int columnNumber() const Q_DECL_OVERRIDE + int columnNumber() const override { return (reader->d_ptr->columnNr == -1 ? -1 : reader->d_ptr->columnNr + 1); } - int lineNumber() const Q_DECL_OVERRIDE + int lineNumber() const override { return (reader->d_ptr->lineNr == -1 ? -1 : reader->d_ptr->lineNr + 1); } diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 77a5a78650..7e048debbc 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -253,29 +253,29 @@ public: QXmlSimpleReader(); virtual ~QXmlSimpleReader(); - bool feature(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; - void setFeature(const QString& name, bool value) Q_DECL_OVERRIDE; - bool hasFeature(const QString& name) const Q_DECL_OVERRIDE; - - void* property(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; - void setProperty(const QString& name, void* value) Q_DECL_OVERRIDE; - bool hasProperty(const QString& name) const Q_DECL_OVERRIDE; - - void setEntityResolver(QXmlEntityResolver* handler) Q_DECL_OVERRIDE; - QXmlEntityResolver* entityResolver() const Q_DECL_OVERRIDE; - void setDTDHandler(QXmlDTDHandler* handler) Q_DECL_OVERRIDE; - QXmlDTDHandler* DTDHandler() const Q_DECL_OVERRIDE; - void setContentHandler(QXmlContentHandler* handler) Q_DECL_OVERRIDE; - QXmlContentHandler* contentHandler() const Q_DECL_OVERRIDE; - void setErrorHandler(QXmlErrorHandler* handler) Q_DECL_OVERRIDE; - QXmlErrorHandler* errorHandler() const Q_DECL_OVERRIDE; - void setLexicalHandler(QXmlLexicalHandler* handler) Q_DECL_OVERRIDE; - QXmlLexicalHandler* lexicalHandler() const Q_DECL_OVERRIDE; - void setDeclHandler(QXmlDeclHandler* handler) Q_DECL_OVERRIDE; - QXmlDeclHandler* declHandler() const Q_DECL_OVERRIDE; - - bool parse(const QXmlInputSource& input) Q_DECL_OVERRIDE; - bool parse(const QXmlInputSource* input) Q_DECL_OVERRIDE; + bool feature(const QString& name, bool *ok = Q_NULLPTR) const override; + void setFeature(const QString& name, bool value) override; + bool hasFeature(const QString& name) const override; + + void* property(const QString& name, bool *ok = Q_NULLPTR) const override; + void setProperty(const QString& name, void* value) override; + bool hasProperty(const QString& name) const override; + + void setEntityResolver(QXmlEntityResolver* handler) override; + QXmlEntityResolver* entityResolver() const override; + void setDTDHandler(QXmlDTDHandler* handler) override; + QXmlDTDHandler* DTDHandler() const override; + void setContentHandler(QXmlContentHandler* handler) override; + QXmlContentHandler* contentHandler() const override; + void setErrorHandler(QXmlErrorHandler* handler) override; + QXmlErrorHandler* errorHandler() const override; + void setLexicalHandler(QXmlLexicalHandler* handler) override; + QXmlLexicalHandler* lexicalHandler() const override; + void setDeclHandler(QXmlDeclHandler* handler) override; + QXmlDeclHandler* declHandler() const override; + + bool parse(const QXmlInputSource& input) override; + bool parse(const QXmlInputSource* input) override; virtual bool parse(const QXmlInputSource* input, bool incremental); virtual bool parseContinue(); @@ -385,40 +385,40 @@ public: QXmlDefaultHandler(); virtual ~QXmlDefaultHandler(); - void setDocumentLocator(QXmlLocator* locator) Q_DECL_OVERRIDE; - bool startDocument() Q_DECL_OVERRIDE; - bool endDocument() Q_DECL_OVERRIDE; - bool startPrefixMapping(const QString& prefix, const QString& uri) Q_DECL_OVERRIDE; - bool endPrefixMapping(const QString& prefix) Q_DECL_OVERRIDE; - bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) Q_DECL_OVERRIDE; - bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName) Q_DECL_OVERRIDE; - bool characters(const QString& ch) Q_DECL_OVERRIDE; - bool ignorableWhitespace(const QString& ch) Q_DECL_OVERRIDE; - bool processingInstruction(const QString& target, const QString& data) Q_DECL_OVERRIDE; - bool skippedEntity(const QString& name) Q_DECL_OVERRIDE; - - bool warning(const QXmlParseException& exception) Q_DECL_OVERRIDE; - bool error(const QXmlParseException& exception) Q_DECL_OVERRIDE; - bool fatalError(const QXmlParseException& exception) Q_DECL_OVERRIDE; - - bool notationDecl(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName) Q_DECL_OVERRIDE; - - bool resolveEntity(const QString& publicId, const QString& systemId, QXmlInputSource*& ret) Q_DECL_OVERRIDE; - - bool startDTD(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool endDTD() Q_DECL_OVERRIDE; - bool startEntity(const QString& name) Q_DECL_OVERRIDE; - bool endEntity(const QString& name) Q_DECL_OVERRIDE; - bool startCDATA() Q_DECL_OVERRIDE; - bool endCDATA() Q_DECL_OVERRIDE; - bool comment(const QString& ch) Q_DECL_OVERRIDE; - - bool attributeDecl(const QString& eName, const QString& aName, const QString& type, const QString& valueDefault, const QString& value) Q_DECL_OVERRIDE; - bool internalEntityDecl(const QString& name, const QString& value) Q_DECL_OVERRIDE; - bool externalEntityDecl(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - - QString errorString() const Q_DECL_OVERRIDE; + void setDocumentLocator(QXmlLocator* locator) override; + bool startDocument() override; + bool endDocument() override; + bool startPrefixMapping(const QString& prefix, const QString& uri) override; + bool endPrefixMapping(const QString& prefix) override; + bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) override; + bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName) override; + bool characters(const QString& ch) override; + bool ignorableWhitespace(const QString& ch) override; + bool processingInstruction(const QString& target, const QString& data) override; + bool skippedEntity(const QString& name) override; + + bool warning(const QXmlParseException& exception) override; + bool error(const QXmlParseException& exception) override; + bool fatalError(const QXmlParseException& exception) override; + + bool notationDecl(const QString& name, const QString& publicId, const QString& systemId) override; + bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName) override; + + bool resolveEntity(const QString& publicId, const QString& systemId, QXmlInputSource*& ret) override; + + bool startDTD(const QString& name, const QString& publicId, const QString& systemId) override; + bool endDTD() override; + bool startEntity(const QString& name) override; + bool endEntity(const QString& name) override; + bool startCDATA() override; + bool endCDATA() override; + bool comment(const QString& ch) override; + + bool attributeDecl(const QString& eName, const QString& aName, const QString& type, const QString& valueDefault, const QString& value) override; + bool internalEntityDecl(const QString& name, const QString& value) override; + bool externalEntityDecl(const QString& name, const QString& publicId, const QString& systemId) override; + + QString errorString() const override; private: QXmlDefaultHandlerPrivate *d; -- cgit v1.2.3