Release-1.7.5

1 files changed, 14 insertions, 9 deletions

diff --git a/src/classlist.cpp b/src/classlist.cpp
index bb6ab73..cb52541 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -36,7 +36,7 @@ static int compItems(void *item1,void *item2)
   ClassDef *c1=(ClassDef *)item1;
   ClassDef *c2=(ClassDef *)item2;
   static bool b = Config_getBool("SORT_BY_SCOPE_NAME");
-  //printf("compItems: %d %s<->%s\n",b,c1->qualifiedName().data(),c2->qualifiedName().data());
+  //printf("compItems: %d %s<->%s\n",b,c1->name().data(),c2->name().data());
   if (b) 
   { 
      return stricmp(c1->name(),
@@ -115,7 +115,7 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
   }
 }
   
-void ClassSDict::writeDocumentation(OutputList &ol,Definition *container)
+void ClassSDict::writeDocumentation(OutputList &ol,Definition * container)
 {
   static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
 
@@ -131,14 +131,19 @@ void ClassSDict::writeDocumentation(OutputList &ol,Definition *container)
     ClassDef *cd=0;
     for (sdi.toFirst();(cd=sdi.current());++sdi)
     {
-      //printf("%s:writeDocumentation() %p=%p embedded=%d\n",
-      //  cd->name().data(),container,cd->getOuterScope(),cd->isEmbeddedInOuterScope());
+      //printf("%s:writeDocumentation() %p embedded=%d container=%p\n",
+      //  cd->name().data(),cd->getOuterScope(),cd->isEmbeddedInOuterScope(),
+      //  container);
 
-      if (cd->name().find('@')==-1 && cd->isEmbeddedInOuterScope() &&
-          (container==0 || // no container -> used for groups
-           cd->getOuterScope()==container || // correct container -> used for namespaces and classes
-           (container->definitionType()==Definition::TypeFile && cd->getOuterScope()==Doxygen::globalScope && cd->partOfGroups()==0) // non grouped class with file scope -> used for files
-          )
+      if (cd->name().find('@')==-1 && 
+          cd->isLinkableInProject() &&
+          cd->isEmbeddedInOuterScope() &&
+          (container==0 || cd->partOfGroups()==0) // if container==0 -> show as part of the group docs, otherwise only show if not part of a group
+          //&&
+          //(container==0 || // no container -> used for groups
+          // cd->getOuterScope()==container || // correct container -> used for namespaces and classes
+          // (container->definitionType()==Definition::TypeFile && cd->getOuterScope()==Doxygen::globalScope && cd->partOfGroups()==0) // non grouped class with file scope -> used for files
+          //)
          )
       {
         if (!found)