From 4c05bc811c06afb718ddbf9db1a3a6cf4086cbc5 Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Sun, 19 Feb 2012 13:41:31 +0000 Subject: Merge overloads. Fix a ### Qt 5 by merging the overloads. Change-Id: If33e7592191c81b32caa6d68c73dbf2282437886 Reviewed-by: David Faure --- src/xml/dom/qdom.cpp | 27 ++++++++++----------------- src/xml/dom/qdom.h | 3 +-- 2 files changed, 11 insertions(+), 19 deletions(-) (limited to 'src/xml/dom') diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 1eaa74a730..2188b8d6ab 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -2668,23 +2668,16 @@ QDomNode QDomNode::namedItem(const QString& name) const the stream \a str. This function uses \a indent as the amount of space to indent the node. - If this node is a document node, the encoding of text stream \a str's encoding is - set by treating a processing instruction by name "xml" as an XML declaration, if such a one exists, - and otherwise defaults to UTF-8. XML declarations are not processing instructions, but this - behavior exists for historical reasons. If this node is not a document node, - the text stream's encoding is used. - If the document contains invalid XML characters or characters that cannot be encoded in the given encoding, the result and behavior is undefined. -*/ -void QDomNode::save(QTextStream& str, int indent) const -{ - save(str, indent, QDomNode::EncodingFromDocument); -} - -/*! - If \a encodingPolicy is QDomNode::EncodingFromDocument, this function behaves as save(QTextStream &str, int indent). + If \a encodingPolicy is QDomNode::EncodingFromDocument and this node is a + document node, the encoding of text stream \a str's encoding is set by + treating a processing instruction by name "xml" as an XML declaration, if + one exists, and otherwise defaults to UTF-8. XML declarations are not + processing instructions, but this behavior exists for historical + reasons. If this node is not a document node, the text stream's encoding + is used. If \a encodingPolicy is EncodingFromTextStream and this node is a document node, this function behaves as save(QTextStream &str, int indent) with the exception that the encoding @@ -2695,15 +2688,15 @@ void QDomNode::save(QTextStream& str, int indent) const \since 4.2 */ -void QDomNode::save(QTextStream& str, int indent, EncodingPolicy encodingPolicy) const +void QDomNode::save(QTextStream& stream, int indent, EncodingPolicy encodingPolicy) const { if (!impl) return; if(isDocument()) - static_cast(impl)->saveDocument(str, indent, encodingPolicy); + static_cast(impl)->saveDocument(stream, indent, encodingPolicy); else - IMPL->save(str, 1, indent); + IMPL->save(stream, 1, indent); } /*! diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 8b049b211b..5dafb9e6a3 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -227,8 +227,7 @@ public: QDomCharacterData toCharacterData() const; QDomComment toComment() const; - void save(QTextStream&, int) const; - void save(QTextStream&, int, EncodingPolicy) const; // ### Qt 5: Merge overload(if we at all keep this) + void save(QTextStream&, int, EncodingPolicy=QDomNode::EncodingFromDocument) const; QDomElement firstChildElement(const QString &tagName = QString()) const; QDomElement lastChildElement(const QString &tagName = QString()) const; -- cgit v1.2.3