diff options
-rw-r--r-- | src/classdef.cpp | 2 | ||||
-rw-r--r-- | src/code.l | 2 | ||||
-rw-r--r-- | src/dirdef.cpp | 3 | ||||
-rw-r--r-- | src/groupdef.cpp | 3 | ||||
-rw-r--r-- | src/memberdef.cpp | 1 | ||||
-rw-r--r-- | src/memberlist.cpp | 3 | ||||
-rw-r--r-- | src/namespacedef.cpp | 2 | ||||
-rw-r--r-- | src/pycode.l | 2 |
8 files changed, 13 insertions, 5 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 88f9a70..7d9e118 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1849,7 +1849,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); SrcLangExt lang = getLanguage(); - if (visibleInParentsDeclList()) + if (visibleInParentsDeclList() && hasDocumentation()) { if (!found) // first class { @@ -3700,7 +3700,7 @@ void codeFreeScanner() extern "C" { // some bogus code to keep the compiler happy void codeYYdummy() { yy_flex_realloc(0,0); } } -#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 +#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." #endif diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 28c073e..ddd0c37 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -228,6 +228,7 @@ void DirDef::writeSubDirList(OutputList &ol) DirDef *dd; for (;(dd=it.current());++it) { + if (!dd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(dd->getOutputFileBase(),0); ol.parseText(theTranslator->trDir(FALSE,TRUE)+" "); @@ -266,6 +267,7 @@ void DirDef::writeFileList(OutputList &ol) FileDef *fd; for (;(fd=it.current());++it) { + if (!fd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(fd->getOutputFileBase(),0); ol.docify(theTranslator->trFile(FALSE,TRUE)+" "); @@ -836,6 +838,7 @@ static void computeCommonDirPrefix() else // dir is shorter than path -> take path of dir as new start { path=dir->name(); + l=path.length(); int i=path.findRev('/',l-2); if (i==-1) // no unique prefix -> stop { diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 55d3733..7a74c65 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -824,6 +824,7 @@ void GroupDef::writeFiles(OutputList &ol,const QCString &title) FileDef *fd; for (;(fd=it.current());++it) { + if (!fd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(fd->getOutputFileBase(),0); ol.docify(theTranslator->trFile(FALSE,TRUE)+" "); @@ -877,6 +878,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title) { if (gd->isVisible()) { + if (!gd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(gd->getOutputFileBase(),0); //ol.docify(theTranslator->trGroup(FALSE,TRUE)); @@ -910,6 +912,7 @@ void GroupDef::writeDirs(OutputList &ol,const QCString &title) DirDef *dd; for (;(dd=it.current());++it) { + if (!dd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(dd->getOutputFileBase(),0); ol.parseText(theTranslator->trDir(FALSE,TRUE)); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index a8e2692..c99bf3c 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1422,6 +1422,7 @@ void MemberDef::writeDeclaration(OutputList &ol, Definition *d=0; ASSERT (cd!=0 || nd!=0 || fd!=0 || gd!=0); // member should belong to something if (cd) d=cd; else if (nd) d=nd; else if (fd) d=fd; else d=gd; + if (!hasDocumentation()) return; //_writeTagData(compoundType); _addToSearchIndex(); diff --git a/src/memberlist.cpp b/src/memberlist.cpp index b985412..b253682 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -387,7 +387,8 @@ void MemberList::writePlainDeclarations(OutputList &ol, } // if this is an anonymous enum and there are variables of this // enum type (i.e. enumVars>0), then we do not show the enum here. - if (enumVars==0) // show enum here + if ((enumVars==0) // show enum here + && md->hasDocumentation()) { //printf("Enum!!\n"); if (first) diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index a2341c7..948c86a 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -984,7 +984,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, ol.startMemberList(); for (ni.toFirst();(nd=ni.current());++ni) { - if (nd->isLinkable()) + if (nd->isLinkable() && nd->hasDocumentation()) { SrcLangExt lang = nd->getLanguage(); if (lang==SrcLangExt_IDL && (isConstantGroup != nd->isConstantGroup())) diff --git a/src/pycode.l b/src/pycode.l index 2b2a668..c3219d9 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/, extern "C" { // some bogus code to keep the compiler happy void pycodeYYdummy() { yy_flex_realloc(0,0); } } -#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 +#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." #endif |