diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/context.cpp | 2 | ||||
| -rw-r--r-- | src/htmldocvisitor.cpp | 4 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 117 | ||||
| -rw-r--r-- | src/memberdef.cpp | 2 | ||||
| -rw-r--r-- | src/vhdldocgen.cpp | 2 |
5 files changed, 37 insertions, 90 deletions
diff --git a/src/context.cpp b/src/context.cpp index 9c99453..2d46c86 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -2663,7 +2663,7 @@ class TextGeneratorHtml : public TextGeneratorIntf void writeBreak(int indent) const { - m_ts << "<br/>"; + m_ts << "<br />"; for (int i=0;i<indent;i++) { m_ts << " "; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 1760531..9d6b069 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -237,7 +237,7 @@ void HtmlDocVisitor::visit(DocURL *u) void HtmlDocVisitor::visit(DocLineBreak *) { if (m_hide) return; - m_t << "<br/>\n"; + m_t << "<br />\n"; } void HtmlDocVisitor::visit(DocHorRuler *hr) @@ -1780,7 +1780,7 @@ void HtmlDocVisitor::visitPre(DocVhdlFlow *vf) m_t << "</a>"; if (vf->hasCaption()) { - m_t << "<br/>"; + m_t << "<br />"; } } } diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index e21071c..0d399d3 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -2181,25 +2181,11 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d, void HtmlGenerator::startMemberList() { DBG_HTML(t << "<!-- startMemberList -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - //} - //else - //{ - // t << "<ul>" << endl; - //} } void HtmlGenerator::endMemberList() { DBG_HTML(t << "<!-- endMemberList -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - //} - //else - //{ - // t << "</ul>" << endl; - //} } // anonymous type: @@ -2254,93 +2240,63 @@ void HtmlGenerator::endMemberTemplateParams(const char *anchor,const char *inher void HtmlGenerator::insertMemberAlign(bool templ) { DBG_HTML(t << "<!-- insertMemberAlign -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - QCString className = templ ? "memTemplItemRight" : "memItemRight"; - t << " </td><td class=\"" << className << "\" valign=\"bottom\">"; - //} + QCString className = templ ? "memTemplItemRight" : "memItemRight"; + t << " </td><td class=\"" << className << "\" valign=\"bottom\">"; } void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheritId) { DBG_HTML(t << "<!-- startMemberDescription -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ if (m_emptySection) { t << "<table class=\"memberdecls\">" << endl; m_emptySection=FALSE; } - t << "<tr class=\"memdesc:" << anchor; - if (inheritId) - { - t << " inherit " << inheritId; - } - t << "\"><td class=\"mdescLeft\"> </td><td class=\"mdescRight\">"; - //} - //else - //{ - // t << "<dl class=\"el\"><dd class=\"mdescRight\">"; - //} + t << "<tr class=\"memdesc:" << anchor; + if (inheritId) + { + t << " inherit " << inheritId; + } + t << "\"><td class=\"mdescLeft\"> </td><td class=\"mdescRight\">"; } void HtmlGenerator::endMemberDescription() { DBG_HTML(t << "<!-- endMemberDescription -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - t << "<br/></td></tr>" << endl; - //} - //else - //{ - // t << "<br/></dl>"; - //} + t << "<br /></td></tr>" << endl; } void HtmlGenerator::startMemberSections() { DBG_HTML(t << "<!-- startMemberSections -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - m_emptySection=TRUE; // we postpone writing <table> until we actually - // write a row to prevent empty tables, which - // are not valid XHTML! - //} + m_emptySection=TRUE; // we postpone writing <table> until we actually + // write a row to prevent empty tables, which + // are not valid XHTML! } void HtmlGenerator::endMemberSections() { DBG_HTML(t << "<!-- endMemberSections -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - if (!m_emptySection) - { - t << "</table>" << endl; - } - //} + if (!m_emptySection) + { + t << "</table>" << endl; + } } void HtmlGenerator::startMemberHeader(const char *anchor) { DBG_HTML(t << "<!-- startMemberHeader -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - if (!m_emptySection) - { - t << "</table>"; - m_emptySection=TRUE; - } - if (m_emptySection) - { - t << "<table class=\"memberdecls\">" << endl; - m_emptySection=FALSE; - } - t << "<tr class=\"heading\"><td colspan=\"2\"><h2 class=\"groupheader\">"; - //} - //else - //{ - // startGroupHeader(FALSE); - //} + if (!m_emptySection) + { + t << "</table>"; + m_emptySection=TRUE; + } + if (m_emptySection) + { + t << "<table class=\"memberdecls\">" << endl; + m_emptySection=FALSE; + } + t << "<tr class=\"heading\"><td colspan=\"2\"><h2 class=\"groupheader\">"; if (anchor) { t << "<a name=\"" << anchor << "\"></a>" << endl; @@ -2350,28 +2306,19 @@ void HtmlGenerator::startMemberHeader(const char *anchor) void HtmlGenerator::endMemberHeader() { DBG_HTML(t << "<!-- endMemberHeader -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - //{ - t << "</h2></td></tr>" << endl; - //} - //else - //{ - // endGroupHeader(FALSE); - //} + t << "</h2></td></tr>" << endl; } void HtmlGenerator::startMemberSubtitle() { DBG_HTML(t << "<!-- startMemberSubtitle -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - t << "<tr><td class=\"ititle\" colspan=\"2\">"; + t << "<tr><td class=\"ititle\" colspan=\"2\">"; } void HtmlGenerator::endMemberSubtitle() { DBG_HTML(t << "<!-- endMemberSubtitle -->" << endl) - //if (Config_getBool("HTML_ALIGN_MEMBERS")) - t << "</td></tr>" << endl; + t << "</td></tr>" << endl; } void HtmlGenerator::startIndexList() @@ -3324,11 +3271,11 @@ void HtmlGenerator::lineBreak(const char *style) { if (style) { - t << "<br class=\"" << style << "\"/>" << endl; + t << "<br class=\"" << style << "\" />" << endl; } else { - t << "<br/>" << endl; + t << "<br />" << endl; } } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 8476568..a1b23e8 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1573,7 +1573,7 @@ void MemberDef::writeDeclaration(OutputList &ol, ); } bool htmlOn = ol.isEnabled(OutputGenerator::Html); - if (htmlOn && /*Config_getBool("HTML_ALIGN_MEMBERS") &&*/ !ltype.isEmpty()) + if (htmlOn && !ltype.isEmpty()) { ol.disable(OutputGenerator::Html); } diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 040a398..4ff5f9d 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -2222,7 +2222,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, } bool htmlOn = ol.isEnabled(OutputGenerator::Html); - if (htmlOn && /*Config_getBool("HTML_ALIGN_MEMBERS") &&*/ !ltype.isEmpty()) + if (htmlOn && !ltype.isEmpty()) { ol.disable(OutputGenerator::Html); } |