[Development] Qt 5.5.0 header diff: QtXml.diff

Frederik Gladhorn Fri, 05 Jun 2015 01:23:16 -0700

diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index 7c5dc7f..5a83659 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.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;

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.5.0 header diff: QtXml.diff

Reply via email to