1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdoc: Don't include internal items in annotated lists

Browse Source 
Now things that are marked internal oe whose parent
is marked internal won't appear in annotated lists.

Task-number: QTBUG-28274
Change-Id: I14ea96e223640cad45e7e4249a3e1fc0642bd9c3
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Martin Smith 2012-11-29 15:12:56 +01:00 committed by The Qt Project
parent 14cb07864e
commit d2d210044f
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/qdoc/ditaxmlgenerator.cpp
View File

@ -2720,6 +2720,15 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
{ {
if (nodes.isEmpty()) if (nodes.isEmpty())
return; return;
bool allInternal = true;
foreach (const Node* node, nodes) {
if (!node->isInternal() && node->status() != Node::Obsolete) {
allInternal = false;
}
}
if (allInternal)
return;
writeStartTag(DT_table); writeStartTag(DT_table);
xmlWriter().writeAttribute("outputclass","annotated"); xmlWriter().writeAttribute("outputclass","annotated");
writeStartTag(DT_tgroup); writeStartTag(DT_tgroup);
@ -2727,7 +2736,7 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
writeStartTag(DT_tbody); writeStartTag(DT_tbody);
foreach (const Node* node, nodes) { foreach (const Node* node, nodes) {
if (node->status() == Node::Obsolete) if (node->isInternal() || node->status() == Node::Obsolete)
continue; continue;
writeStartTag(DT_row); writeStartTag(DT_row);

10
src/tools/qdoc/htmlgenerator.cpp
View File

@ -2212,10 +2212,18 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
CodeMarker *marker, CodeMarker *marker,
const NodeList& nodes) const NodeList& nodes)
{ {
bool allInternal = true;
foreach (const Node* node, nodes) {
if (!node->isInternal() && node->status() != Node::Obsolete) {
allInternal = false;
}
}
if (allInternal)
return;
out() << "<table class=\"annotated\">\n"; out() << "<table class=\"annotated\">\n";
int row = 0; int row = 0;
foreach (const Node* node, nodes) { foreach (const Node* node, nodes) {
if (node->status() == Node::Obsolete) if (node->isInternal() || node->status() == Node::Obsolete)
continue; continue;
if (++row % 2 == 1) if (++row % 2 == 1)