diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-12-07 22:26:43 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-12-07 22:26:43 (GMT) |
commit | db9057334a6baeae86d8de93ffc895fd6aa752fd (patch) | |
tree | 6dd5d34269997984f4873ab3809aba42b40e5116 /src | |
parent | 83f1dfc59d3c168204cdce74b72edf445dea3b61 (diff) | |
parent | bdbc5d8a2fe51cc7055365d90d7f7ce45f9dfac1 (diff) | |
download | Doxygen-db9057334a6baeae86d8de93ffc895fd6aa752fd.zip Doxygen-db9057334a6baeae86d8de93ffc895fd6aa752fd.tar.gz Doxygen-db9057334a6baeae86d8de93ffc895fd6aa752fd.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r-- | src/docbookvisitor.cpp | 4 | ||||
-rw-r--r-- | src/htmldocvisitor.cpp | 3 | ||||
-rw-r--r-- | src/latexdocvisitor.cpp | 4 | ||||
-rw-r--r-- | src/mandocvisitor.cpp | 4 | ||||
-rw-r--r-- | src/perlmodgen.cpp | 6 | ||||
-rw-r--r-- | src/rtfdocvisitor.cpp | 4 | ||||
-rw-r--r-- | src/xmldocvisitor.cpp | 4 |
7 files changed, 22 insertions, 7 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 402f3c0..aaea045 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -1160,6 +1160,7 @@ void DocbookDocVisitor::visitPost(DocParamList *) void DocbookDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "<para><link linkend=\""; m_t << x->file() << "_1" << x->anchor(); m_t << "\">"; @@ -1168,9 +1169,10 @@ void DocbookDocVisitor::visitPre(DocXRefItem *x) m_t << " "; } -void DocbookDocVisitor::visitPost(DocXRefItem *) +void DocbookDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "</para>"; } diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 601b665..815a16d 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1777,6 +1777,8 @@ void HtmlDocVisitor::visitPost(DocParamList *) void HtmlDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; + forceEndParagraph(x); bool anonymousEnum = x->file()=="@"; if (!anonymousEnum) @@ -1798,6 +1800,7 @@ void HtmlDocVisitor::visitPre(DocXRefItem *x) void HtmlDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "</dd></dl>" << endl; forceStartParagraph(x); } diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index e68a51b..91064a3 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -1515,6 +1515,7 @@ void LatexDocVisitor::visitPost(DocParamList *pl) void LatexDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "\\begin{DoxyRefDesc}{"; filter(x->title()); m_t << "}" << endl; @@ -1534,9 +1535,10 @@ void LatexDocVisitor::visitPre(DocXRefItem *x) m_t << "}]"; } -void LatexDocVisitor::visitPost(DocXRefItem *) +void LatexDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "\\end{DoxyRefDesc}" << endl; } diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp index 238233c..729f3d4 100644 --- a/src/mandocvisitor.cpp +++ b/src/mandocvisitor.cpp @@ -933,6 +933,7 @@ void ManDocVisitor::visitPost(DocParamList *pl) void ManDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; if (!m_firstCol) { m_t << endl; @@ -944,9 +945,10 @@ void ManDocVisitor::visitPre(DocXRefItem *x) m_t << ".RS 4" << endl; } -void ManDocVisitor::visitPost(DocXRefItem *) +void ManDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; if (!m_firstCol) m_t << endl; m_t << ".RE" << endl; m_t << ".PP" << endl; diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 81e41a8..5537438 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1349,7 +1349,7 @@ void PerlModDocVisitor::visitPost(DocParamList *) .closeHash(); } -void PerlModDocVisitor::visitPre(DocXRefItem *) +void PerlModDocVisitor::visitPre(DocXRefItem *x) { #if 0 m_output.add("<xrefsect id=\""); @@ -1360,12 +1360,14 @@ void PerlModDocVisitor::visitPre(DocXRefItem *) m_output.add("</xreftitle>"); m_output.add("<xrefdescription>"); #endif + if (x->title().isEmpty()) return; openItem("xrefitem"); openSubBlock("content"); } -void PerlModDocVisitor::visitPost(DocXRefItem *) +void PerlModDocVisitor::visitPost(DocXRefItem *x) { + if (x->title().isEmpty()) return; closeSubBlock(); closeItem(); #if 0 diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 576581a..7c2fef8 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1579,6 +1579,7 @@ void RTFDocVisitor::visitPost(DocParamList *pl) void RTFDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; bool anonymousEnum = x->file()=="@"; DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocXRefItem)}\n"); m_t << "{"; // start param list @@ -1624,9 +1625,10 @@ void RTFDocVisitor::visitPre(DocXRefItem *x) m_lastIsPara=FALSE; } -void RTFDocVisitor::visitPost(DocXRefItem *) +void RTFDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocXRefItem)}\n"); m_t << "\\par" << endl; decIndentLevel(); diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index e38a204..8df1acf 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -1012,6 +1012,7 @@ void XmlDocVisitor::visitPost(DocParamList *) void XmlDocVisitor::visitPre(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "<xrefsect id=\""; m_t << x->file() << "_1" << x->anchor(); m_t << "\">"; @@ -1021,9 +1022,10 @@ void XmlDocVisitor::visitPre(DocXRefItem *x) m_t << "<xrefdescription>"; } -void XmlDocVisitor::visitPost(DocXRefItem *) +void XmlDocVisitor::visitPost(DocXRefItem *x) { if (m_hide) return; + if (x->title().isEmpty()) return; m_t << "</xrefdescription>"; m_t << "</xrefsect>"; } |