diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2007-03-15 10:14:23 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2007-03-15 10:14:23 (GMT) |
commit | cc52853c15833c9a18be11c140b99d94d9e06e9e (patch) | |
tree | 5300b179faf00eea740dda6ee3be5343c70b1c79 /src/memberdef.cpp | |
parent | eb591296685b8268427173e0a24f74abd987170d (diff) | |
download | Doxygen-cc52853c15833c9a18be11c140b99d94d9e06e9e.zip Doxygen-cc52853c15833c9a18be11c140b99d94d9e06e9e.tar.gz Doxygen-cc52853c15833c9a18be11c140b99d94d9e06e9e.tar.bz2 |
Release-1.5.1-20070315
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r-- | src/memberdef.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 155e10d..e149cc9 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1549,7 +1549,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, QCString cfiname = container->getOutputFileBase(); static bool hasHtmlHelp = Config_getBool("GENERATE_HTML") && Config_getBool("GENERATE_HTMLHELP"); - HtmlHelp *htmlHelp = 0; + HtmlHelp *htmlHelp = HtmlHelp::getInstance(); if (hasHtmlHelp) { if (isEnumerate() && name().at(0)=='@') @@ -1558,7 +1558,6 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, } else { - htmlHelp = HtmlHelp::getInstance(); htmlHelp->addIndexItem(ciname, // level1 name(), // level2 separateMemPages ? cfname : cfiname, // contRef @@ -1876,7 +1875,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, } /* write detailed description */ - if (!detailed.isEmpty()) + if (!detailed.isEmpty() || !m_impl->inbodyDocs.isEmpty()) { ol.parseDoc(docFile(),docLine(),getOuterScope()?getOuterScope():container,this,detailed+"\n",TRUE,FALSE); if (!m_impl->inbodyDocs.isEmpty()) |