diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-19 12:40:36 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-19 12:40:36 (GMT) |
commit | a9f93437b6b2b9686e1b4f2e691782c6ebe99c26 (patch) | |
tree | 73954c82fd10611ace85b0bd53f2fb1caad53c72 /src/memberlist.cpp | |
parent | 9214d84a513a34f9e6137ee779c528504790e58d (diff) | |
download | Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.zip Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.gz Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.bz2 |
Fixed issues with SEPARATE_MEMBER_PAGES and INLINE_SIMPLE_STRUCTS
Diffstat (limited to 'src/memberlist.cpp')
-rw-r--r-- | src/memberlist.cpp | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/src/memberlist.cpp b/src/memberlist.cpp index d5f9ea4..e0851fe 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -379,9 +379,18 @@ void MemberList::writePlainDeclarations(OutputList &ol, } ol.startMemberDeclaration(); ol.startMemberItem(md->anchor(),0,inheritId); + bool detailsLinkable = md->isDetailedSectionLinkable(); + if (!detailsLinkable) + { + ol.startDoxyAnchor(md->getOutputFileBase(),0,md->anchor(),md->name(),QCString()); + } ol.writeString("enum "); ol.insertMemberAlign(); md->writeEnumDeclaration(ol,cd,nd,fd,gd,compoundType); + if (!detailsLinkable) + { + ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor()); + } ol.endMemberItem(); if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { @@ -694,52 +703,53 @@ void MemberList::writeDocumentationPage(OutputList &ol, MemberDef *md; for ( ; (md=mli.current()) ; ++mli) { - QCString diskName=md->getOutputFileBase(); - QCString title=md->qualifiedName(); - startFile(ol,diskName,md->name(),title,HLI_None,!generateTreeView, - container->getOutputFileBase()); - if (!generateTreeView) + if (md->isDetailedSectionLinkable()) { - container->writeNavigationPath(ol); - ol.endQuickIndices(); - } - ol.startContents(); - + QCString diskName=md->getOutputFileBase(); + QCString title=md->qualifiedName(); + startFile(ol,diskName,md->name(),title,HLI_None,!generateTreeView,diskName); + if (!generateTreeView) + { + container->writeNavigationPath(ol); + ol.endQuickIndices(); + } + ol.startContents(); - if (generateTreeView) - { - md->writeDocumentation(this,ol,scopeName,container,m_inGroup); - ol.endContents(); - endFileWithNavPath(container,ol); - } - else - { - ol.writeString("<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n" - " <tr>\n" - " <td valign=\"top\">\n"); + if (generateTreeView) + { + md->writeDocumentation(this,ol,scopeName,container,m_inGroup); + ol.endContents(); + endFileWithNavPath(container,ol); + } + else + { + ol.writeString("<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n" + " <tr>\n" + " <td valign=\"top\">\n"); - container->writeQuickMemberLinks(ol,md); + container->writeQuickMemberLinks(ol,md); - ol.writeString(" </td>\n"); - ol.writeString(" <td valign=\"top\" class=\"mempage\">\n"); + ol.writeString(" </td>\n"); + ol.writeString(" <td valign=\"top\" class=\"mempage\">\n"); - md->writeDocumentation(this,ol,scopeName,container,m_inGroup); + md->writeDocumentation(this,ol,scopeName,container,m_inGroup); - ol.writeString(" </td>\n"); - ol.writeString(" </tr>\n"); - ol.writeString("</table>\n"); + ol.writeString(" </td>\n"); + ol.writeString(" </tr>\n"); + ol.writeString("</table>\n"); - endFile(ol); + endFile(ol); + } } - } - if (memberGroupList) - { - //printf("MemberList::writeDocumentation() -- member groups\n"); - MemberGroupListIterator mgli(*memberGroupList); - MemberGroup *mg; - for (;(mg=mgli.current());++mgli) + if (memberGroupList) { - mg->writeDocumentationPage(ol,scopeName,container); + //printf("MemberList::writeDocumentation() -- member groups\n"); + MemberGroupListIterator mgli(*memberGroupList); + MemberGroup *mg; + for (;(mg=mgli.current());++mgli) + { + mg->writeDocumentationPage(ol,scopeName,container); + } } } } |