summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-27 12:28:06 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-27 12:29:16 (GMT)
commit16275ff6b9abc085a498428170047f2bee9ee30b (patch)
tree631b1f9a95019d008e53439f6280c5d69a43056a /tools
parent962d216ce9f9f1e6bd73fe43e3d2a7c86f64b75f (diff)
downloadQt-16275ff6b9abc085a498428170047f2bee9ee30b.zip
Qt-16275ff6b9abc085a498428170047f2bee9ee30b.tar.gz
Qt-16275ff6b9abc085a498428170047f2bee9ee30b.tar.bz2
A few html code generator fixes.
There was an empty <div> element with a name that came after it. I moved the name inside the <div> element. And there were some <b> elements that began inside one element and ended inside the next element. I just removed them, because they didn't really add anything. And I made the "Access functions:" bold.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 798cbb5..e2e6950 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2207,18 +2207,14 @@ void HtmlGenerator::generateSectionList(const Section& section,
else {
if (twoColumn && i == (int) (section.members.count() + 1) / 2)
out() << "</ul></td><td valign=\"top\"><ul>\n";
- out() << "<li><div class=\"fn\"></div>";
+ out() << "<li><div class=\"fn\">";
}
- if (style == CodeMarker::Accessors)
- out() << "<b>";
generateSynopsis(*m, relative, marker, style, name_alignment);
- if (style == CodeMarker::Accessors)
- out() << "</b>";
if (name_alignment)
out() << "</td></tr>\n";
else
- out() << "</li>\n";
+ out() << "</div></li>\n";
i++;
++m;
}
@@ -2283,8 +2279,10 @@ void HtmlGenerator::generateSynopsis(const Node *node,
marked.replace("<@param>", "<i>");
marked.replace("</@param>", "</i>");
- if (style == CodeMarker::Summary)
- marked.replace("@name>", "b>");
+ if (style == CodeMarker::Summary) {
+ marked.replace("<@name>", ""); // was "<b>"
+ marked.replace("</@name>", ""); // was "</b>"
+ }
if (style == CodeMarker::SeparateList) {
QRegExp extraRegExp("<@extra>.*</@extra>");
@@ -3090,7 +3088,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
section.members += property->resetters();
if (!section.members.isEmpty()) {
- out() << "<p>Access functions:</p>\n";
+ out() << "<p><b>Access functions:</b></p>\n";
generateSectionList(section, node, marker, CodeMarker::Accessors);
}
}