diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-05-09 14:27:40 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 20:10:44 +0200 |
commit | 66ca9382c978bba137219df86b677c9fdc0d4d1c (patch) | |
tree | a3aed9ec1a3ead73c3dd637f3f9e16310692fc44 | |
parent | bbe9b28c0b241083a782567a65c9aed69c43b187 (diff) |
QDoc: Remove generateQmlDesc and use generateApiDesc instead.
generateQmlDesc was basically a copy of generateApiDesc. Just using
generateApiDesc also fixes a bug with the generation of a <shortDesc>
inside an <apiDesc>
Change-Id: I129a24ab0244283cc394c2afacc0f8227e4e5a88
Reviewed-by: Martin Smith <martin.smith@nokia.com>
-rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 27 | ||||
-rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.h | 1 |
2 files changed, 6 insertions, 22 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 9e22d08a40..b24a6af660 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -4496,7 +4496,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node, if (qpgn->childNodes().size() == 1) { qpn = static_cast<QmlPropertyNode*>(*p); startQmlProperty(qpn,relative,marker); - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlPropertyDetail> writeEndTag(); // </qmlProperty> } @@ -4509,7 +4509,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node, //writeCharacters("..."); writeEndTag(); // </apiName> writeStartTag(DT_qmlPropertyGroupDetail); - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlPropertyGroupDetail> while (p != qpgn->childNodes().end()) { if ((*p)->type() == Node::QmlProperty) { @@ -4527,7 +4527,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node, qpn = static_cast<QmlPropertyNode*>(node); if (qpn->qmlPropNodes().isEmpty()) { startQmlProperty(qpn,relative,marker); - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlPropertyDetail> writeEndTag(); // </qmlProperty> } @@ -4536,7 +4536,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node, if (n->type() == Node::QmlProperty) { qpn = static_cast<QmlPropertyNode*>(n); startQmlProperty(qpn,relative,marker); - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlPropertyDetail> writeEndTag(); // </qmlProperty> } @@ -4555,7 +4555,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node, //writeCharacters("..."); writeEndTag(); // </apiName> writeStartTag(DT_qmlPropertyGroupDetail); - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlPropertyGroupDetail> NodeList::ConstIterator p = qpn->qmlPropNodes().begin(); while (p != qpn->qmlPropNodes().end()) { @@ -4606,27 +4606,12 @@ void DitaXmlGenerator::writeQmlRef(DitaTag tag, writeEndTag(); // </qmlAttached> } writeEndTag(); // </qmlXxxDef> - writeQmlDesc(node, marker); + writeApiDesc(node, marker, node->title()); writeEndTag(); // </qmlXxxDetail> writeEndTag(); // tag } /*! - Writes the <apiDesc> tag and its contents for the \a node. - The \a marker is used for markeing up the text body. - */ -void DitaXmlGenerator::writeQmlDesc(Node* node, CodeMarker* marker) -{ - writeStartTag(DT_apiDesc); - generateStatus(node, marker); - generateBody(node, marker); - generateThreadSafeness(node, marker); - generateSince(node, marker); - generateAlsoList(node, marker); - writeEndTag(); // </apiDesc> -} - -/*! This generates a <qmlTypeDef> in which the QML module name and version number are specified. */ diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h index 538a667849..56cf48614c 100644 --- a/src/tools/qdoc/ditaxmlgenerator.h +++ b/src/tools/qdoc/ditaxmlgenerator.h @@ -418,7 +418,6 @@ private: Node* node, const InnerNode* relative, CodeMarker* marker); - void writeQmlDesc(Node* node, CodeMarker* marker); void generateDetailedQmlMember(Node* node, const InnerNode* relative, CodeMarker* marker); |