diff options
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index c2d2d22..007f62a 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1158,16 +1158,14 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, QStringList names; names << (*m)->name(); if ((*m)->type() == Node::Function) { - const FunctionNode *func = - reinterpret_cast<const FunctionNode *>(*m); + const FunctionNode *func = reinterpret_cast<const FunctionNode *>(*m); if (func->metaness() == FunctionNode::Ctor || - func->metaness() == FunctionNode::Dtor - || func->overloadNumber() != 1) + func->metaness() == FunctionNode::Dtor || + func->overloadNumber() != 1) names.clear(); } else if ((*m)->type() == Node::Property) { - const PropertyNode *prop = - reinterpret_cast<const PropertyNode *>(*m); + const PropertyNode *prop = reinterpret_cast<const PropertyNode *>(*m); if (!prop->getters().isEmpty() && !names.contains(prop->getters().first()->name())) names << prop->getters().first()->name(); @@ -1177,14 +1175,13 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, names << prop->resetters().first()->name(); } else if ((*m)->type() == Node::Enum) { - const EnumNode *enume = - reinterpret_cast<const EnumNode *>(*m); + const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m); if (enume->flagsType()) names << enume->flagsType()->name(); foreach (const QString &enumName, - enume->doc().enumItemNames().toSet() - - enume->doc().omitEnumItemNames().toSet()) + enume->doc().enumItemNames().toSet() - + enume->doc().omitEnumItemNames().toSet()) names << plainCode(marker->markedUpEnumValue(enumName, enume)); } @@ -2365,7 +2362,7 @@ void HtmlGenerator::generateSectionList(const Section& section, } if (name_alignment) { out() << "<table border=\"0\" cellpadding=\"0\" " - << "cellspacing=\"0\">\n"; + << "cellspacing=\"0\" width=\"100%\">\n"; } else { if (twoColumn) @@ -2501,8 +2498,8 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode, static const QString linkTag("link"); for (int i = 0, n = src.size(); i < n;) { if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') { - if (nameAlignment && (i != 0)) - html += " </td><td class=\"memItemRight\" valign=\"bottom\">"; + if (nameAlignment) // && (i != 0)) Why was this here? + html += "</td><td class=\"memItemRight\" valign=\"bottom\">"; i += 2; if (parseArg(src, linkTag, &i, n, &arg, &par1)) { QString link = linkForNode( @@ -3314,7 +3311,8 @@ void HtmlGenerator::findAllClasses(const InnerNode *node) if ((*c)->access() != Node::Private && (*c)->url().isEmpty()) { if ((*c)->type() == Node::Class && !(*c)->doc().isEmpty()) { QString className = (*c)->name(); - if ((*c)->parent() && (*c)->parent()->type() == Node::Namespace && + if ((*c)->parent() && + (*c)->parent()->type() == Node::Namespace && !(*c)->parent()->name().isEmpty()) className = (*c)->parent()->name()+"::"+className; |