diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-02-10 06:21:47 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-02-12 10:07:27 +0100 |
| commit | 2af1e2fe77a5a8f83d343f5d06923b070e486f41 (patch) | |
| tree | 8af8c1078e2ea4771f94d1f8ea1258b5e8f3dd54 | |
| parent | a051d2ec7be908128234231504709d98b20a445a (diff) | |
QDoc: Fix tag-files for enum types and values
* Use correct tag member name.
* Use correct tag names when writing tag-files.
* Also prefer ranged-for in a loop.
Fixes: QTBUG-61790
Change-Id: I486fcd125f473f72c497ccbd1e9f7baa371bcebc
Done-With: Maxim Paperno <max@wdg.us>
Reviewed-by: Maxim Paperno <max@wdg.us>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/qdoc/qdoctagfiles.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/qdoc/qdoctagfiles.cpp b/src/qdoc/qdoctagfiles.cpp index 8d97ce48a..2fa3f34e6 100644 --- a/src/qdoc/qdoctagfiles.cpp +++ b/src/qdoc/qdoctagfiles.cpp @@ -181,7 +181,7 @@ void QDocTagFiles::generateTagFileMembers(QXmlStreamWriter &writer, const Aggreg switch (node->nodeType()) { case Node::Enum: nodeName = "member"; - kind = "enum"; + kind = "enumeration"; break; case Node::Typedef: nodeName = "member"; @@ -292,14 +292,15 @@ void QDocTagFiles::generateTagFileMembers(QXmlStreamWriter &writer, const Aggreg const EnumNode *enumNode = static_cast<const EnumNode *>(node); writer.writeTextElement("name", objName); QStringList pieces = gen_->fullDocumentLocation(node, false).split(QLatin1Char('#')); + writer.writeTextElement("anchorfile", pieces[0]); writer.writeTextElement("anchor", pieces[1]); - writer.writeTextElement("arglist", QString()); writer.writeEndElement(); // member - for (int i = 0; i < enumNode->items().size(); ++i) { - EnumItem item = enumNode->items().value(i); + for (const auto &item : enumNode->items()) { writer.writeStartElement("member"); - writer.writeAttribute("name", item.name()); + writer.writeAttribute("kind", "enumvalue"); + writer.writeTextElement("name", item.name()); + writer.writeTextElement("anchorfile", pieces[0]); writer.writeTextElement("anchor", pieces[1]); writer.writeTextElement("arglist", QString()); writer.writeEndElement(); // member |