From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- 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 9068830c4b..de4c499c11 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -285,16 +285,16 @@ public: void init(); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNodePrivate* insertBefore(QDomNodePrivate* newChild, QDomNodePrivate* refChild); - QDomNodePrivate* insertAfter(QDomNodePrivate* newChild, QDomNodePrivate* refChild); - QDomNodePrivate* replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild); - QDomNodePrivate* removeChild(QDomNodePrivate* oldChild); - QDomNodePrivate* appendChild(QDomNodePrivate* newChild); + 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; - QDomNode::NodeType nodeType() const { return QDomNode::DocumentTypeNode; } + QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentTypeNode; } - void save(QTextStream& s, int, int) const; + void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; // Variables QDomNamedNodeMapPrivate* entities; @@ -311,8 +311,8 @@ public: QDomDocumentFragmentPrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - virtual QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::DocumentFragmentNode; } + virtual QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentFragmentNode; } }; class QDomCharacterDataPrivate : public QDomNodePrivate @@ -329,8 +329,8 @@ public: void replaceData(unsigned long offset, unsigned long count, const QString& arg); // Reimplemented from QDomNodePrivate - QDomNode::NodeType nodeType() const { return QDomNode::CharacterDataNode; } - QDomNodePrivate* cloneNode(bool deep = true); + QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CharacterDataNode; } + QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; }; class QDomTextPrivate : public QDomCharacterDataPrivate @@ -342,9 +342,9 @@ public: QDomTextPrivate* splitText(int offset); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::TextNode; } - virtual void save(QTextStream& s, int, int) const; + 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; }; class QDomAttrPrivate : public QDomNodePrivate @@ -357,10 +357,10 @@ public: bool specified() const; // Reimplemented from QDomNodePrivate - void setNodeValue(const QString& v); - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::AttributeNode; } - virtual void save(QTextStream& s, int, int) const; + 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; // Variables bool m_specified; @@ -392,9 +392,9 @@ public: // Reimplemented from QDomNodePrivate QDomNamedNodeMapPrivate* attributes() { return m_attr; } bool hasAttributes() { return (m_attr->length() > 0); } - QDomNode::NodeType nodeType() const { return QDomNode::ElementNode; } - QDomNodePrivate* cloneNode(bool deep = true); - virtual void save(QTextStream& s, int, int) const; + 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; // Variables QDomNamedNodeMapPrivate* m_attr; @@ -408,9 +408,9 @@ public: QDomCommentPrivate(QDomCommentPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::CommentNode; } - virtual void save(QTextStream& s, int, int) const; + 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; }; class QDomCDATASectionPrivate : public QDomTextPrivate @@ -420,9 +420,9 @@ public: QDomCDATASectionPrivate(QDomCDATASectionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::CDATASectionNode; } - virtual void save(QTextStream& s, int, int) const; + 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; }; class QDomNotationPrivate : public QDomNodePrivate @@ -433,9 +433,9 @@ public: QDomNotationPrivate(QDomNotationPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::NotationNode; } - virtual void save(QTextStream& s, int, int) const; + 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; // Variables QString m_sys; @@ -450,9 +450,9 @@ public: QDomEntityPrivate(QDomEntityPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::EntityNode; } - virtual void save(QTextStream& s, int, int) const; + 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; // Variables QString m_sys; @@ -467,9 +467,9 @@ public: QDomEntityReferencePrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::EntityReferenceNode; } - virtual void save(QTextStream& s, int, int) const; + 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; }; class QDomProcessingInstructionPrivate : public QDomNodePrivate @@ -480,9 +480,9 @@ public: QDomProcessingInstructionPrivate(QDomProcessingInstructionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::ProcessingInstructionNode; } - virtual void save(QTextStream& s, int, int) const; + 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; }; class QDomDocumentPrivate : public QDomNodePrivate @@ -517,9 +517,9 @@ public: QDomNodePrivate* importNode(const QDomNodePrivate* importedNode, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true); - QDomNode::NodeType nodeType() const { return QDomNode::DocumentNode; } - void clear(); + QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentNode; } + void clear() Q_DECL_OVERRIDE; // Variables QExplicitlySharedDataPointer impl; @@ -570,32 +570,32 @@ public: ~QDomHandler(); // content handler - bool endDocument(); - bool startElement(const QString& nsURI, const QString& localName, const QString& qName, const QXmlAttributes& atts); - bool endElement(const QString& nsURI, const QString& localName, const QString& qName); - bool characters(const QString& ch); - bool processingInstruction(const QString& target, const QString& data); - bool skippedEntity(const QString& name); + 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; // error handler - bool fatalError(const QXmlParseException& exception); + bool fatalError(const QXmlParseException& exception) Q_DECL_OVERRIDE; // lexical handler - bool startCDATA(); - bool endCDATA(); - bool startEntity(const QString &); - bool endEntity(const QString &); - bool startDTD(const QString& name, const QString& publicId, const QString& systemId); - bool comment(const QString& ch); + 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; // decl handler - bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) ; + bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) Q_DECL_OVERRIDE ; // DTD handler - bool notationDecl(const QString & name, const QString & publicId, const QString & systemId); - bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString ¬ationName) ; + 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 ; - void setDocumentLocator(QXmlLocator *locator); + void setDocumentLocator(QXmlLocator *locator) Q_DECL_OVERRIDE; QString errorMsg; int errorLine; diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 106bdf2dec..a77c70787d 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -434,11 +434,11 @@ public: { } - int columnNumber() const + int columnNumber() const Q_DECL_OVERRIDE { return (reader->d_ptr->columnNr == -1 ? -1 : reader->d_ptr->columnNr + 1); } - int lineNumber() const + int lineNumber() const Q_DECL_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 d583388856..4a571194b4 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -229,29 +229,29 @@ public: QXmlSimpleReader(); virtual ~QXmlSimpleReader(); - bool feature(const QString& name, bool *ok = 0) const; - void setFeature(const QString& name, bool value); - bool hasFeature(const QString& name) const; - - void* property(const QString& name, bool *ok = 0) const; - void setProperty(const QString& name, void* value); - bool hasProperty(const QString& name) const; - - void setEntityResolver(QXmlEntityResolver* handler); - QXmlEntityResolver* entityResolver() const; - void setDTDHandler(QXmlDTDHandler* handler); - QXmlDTDHandler* DTDHandler() const; - void setContentHandler(QXmlContentHandler* handler); - QXmlContentHandler* contentHandler() const; - void setErrorHandler(QXmlErrorHandler* handler); - QXmlErrorHandler* errorHandler() const; - void setLexicalHandler(QXmlLexicalHandler* handler); - QXmlLexicalHandler* lexicalHandler() const; - void setDeclHandler(QXmlDeclHandler* handler); - QXmlDeclHandler* declHandler() const; - - bool parse(const QXmlInputSource& input); - bool parse(const QXmlInputSource* input); + bool feature(const QString& name, bool *ok = 0) 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 = 0) 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; virtual bool parse(const QXmlInputSource* input, bool incremental); virtual bool parseContinue(); @@ -361,40 +361,40 @@ public: QXmlDefaultHandler(); virtual ~QXmlDefaultHandler(); - void setDocumentLocator(QXmlLocator* locator); - bool startDocument(); - bool endDocument(); - bool startPrefixMapping(const QString& prefix, const QString& uri); - bool endPrefixMapping(const QString& prefix); - bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts); - bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName); - bool characters(const QString& ch); - bool ignorableWhitespace(const QString& ch); - bool processingInstruction(const QString& target, const QString& data); - bool skippedEntity(const QString& name); - - bool warning(const QXmlParseException& exception); - bool error(const QXmlParseException& exception); - bool fatalError(const QXmlParseException& exception); - - bool notationDecl(const QString& name, const QString& publicId, const QString& systemId); - bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName); - - bool resolveEntity(const QString& publicId, const QString& systemId, QXmlInputSource*& ret); - - bool startDTD(const QString& name, const QString& publicId, const QString& systemId); - bool endDTD(); - bool startEntity(const QString& name); - bool endEntity(const QString& name); - bool startCDATA(); - bool endCDATA(); - bool comment(const QString& ch); - - bool attributeDecl(const QString& eName, const QString& aName, const QString& type, const QString& valueDefault, const QString& value); - bool internalEntityDecl(const QString& name, const QString& value); - bool externalEntityDecl(const QString& name, const QString& publicId, const QString& systemId); - - QString errorString() const; + 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; private: QXmlDefaultHandlerPrivate *d; -- cgit v1.2.3