Release-1.3-rc3

1 files changed, 17 insertions, 125 deletions

diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 28a3e9a..aea2f27 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -193,130 +193,16 @@ void MemberList::writePlainDeclarations(OutputList &ol,
       case MemberDef::Property:  // fall through
       case MemberDef::Event:  
       {
-        if (first) ol.startMemberList(),first=FALSE;
-        md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+        if (md->isBriefSectionVisible())
+        {
+          if (first) ol.startMemberList(),first=FALSE;
+          md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+        }
         break;
       }
       case MemberDef::Enumeration: 
       {
         if (first) ol.startMemberList(),first=FALSE;
-#if 0
-        OutputList typeDecl(&ol);
-        QCString name(md->name());
-        int i=name.findRev("::");
-        if (i!=-1) name=name.right(name.length()-i-2); // strip scope (TODO: is this needed?)
-        if (name[0]!='@') // not an anonymous enum
-        {
-          if (md->isLinkableInProject() || md->hasDocumentedEnumValues())
-          {
-            if (!Config_getString("GENERATE_TAGFILE").isEmpty())
-            {
-              Doxygen::tagFile << "    <member kind=\"enumeration\">" << endl;
-              Doxygen::tagFile << "      <name>" << convertToXML(md->name()) << "</name>" << endl; 
-              Doxygen::tagFile << "      <anchor>" << convertToXML(md->anchor()) << "</anchor>" << endl; 
-              Doxygen::tagFile << "      <arglist>" << convertToXML(md->argsString()) << "</arglist>" << endl; 
-              Doxygen::tagFile << "    </member>" << endl;
-            }
-            md->writeLink(typeDecl,cd,nd,fd,gd);
-          }
-          else
-          {
-            typeDecl.startBold();
-            typeDecl.docify(name);
-            typeDecl.endBold();
-          }
-          typeDecl.writeChar(' ');
-        }
-
-        int enumMemCount=0;
-
-        QList<MemberDef> *fmdl=md->enumFieldList();
-        uint numVisibleEnumValues=0;
-        if (fmdl)
-        {
-          MemberDef *fmd=fmdl->first();
-          while (fmd)
-          {
-            if (fmd->isBriefSectionVisible()) numVisibleEnumValues++;
-            fmd=fmdl->next();
-          }
-        }
-        if (numVisibleEnumValues==0 && !md->isBriefSectionVisible()) break;
-        if (numVisibleEnumValues>0)
-        {
-          uint enumValuesPerLine = (uint)Config_getInt("ENUM_VALUES_PER_LINE");
-          typeDecl.docify("{ ");
-          if (fmdl)
-          {
-            MemberDef *fmd=fmdl->first();
-            bool fmdVisible = fmd->isBriefSectionVisible();
-            while (fmd)
-            {
-              if (fmdVisible)
-              {
-                /* in html we start a new line after a number of items */
-                if (numVisibleEnumValues>enumValuesPerLine
-                    && (enumMemCount%enumValuesPerLine)==0
-                   )
-                {
-                  typeDecl.pushGeneratorState();
-                  typeDecl.disableAllBut(OutputGenerator::Html);
-                  typeDecl.lineBreak(); 
-                  typeDecl.writeString("&nbsp;&nbsp;");
-                  typeDecl.popGeneratorState();
-                }
-
-                if (fmd->hasDocumentation()) // enum value has docs
-                {
-                  if (!Config_getString("GENERATE_TAGFILE").isEmpty())
-                  {
-                    Doxygen::tagFile << "    <member kind=\"enumvalue\">" << endl;
-                    Doxygen::tagFile << "      <name>" << convertToXML(fmd->name()) << "</name>" << endl; 
-                    Doxygen::tagFile << "      <anchor>" << convertToXML(fmd->anchor()) << "</anchor>" << endl; 
-                    Doxygen::tagFile << "      <arglist>" << convertToXML(fmd->argsString()) << "</arglist>" << endl; 
-                    Doxygen::tagFile << "    </member>" << endl;
-                  }
-                  fmd->writeLink(typeDecl,cd,nd,fd,gd);
-                }
-                else // no docs for this enum value
-                {
-                  typeDecl.startBold();
-                  typeDecl.docify(fmd->name());
-                  typeDecl.endBold();
-                }
-                if (fmd->hasOneLineInitializer()) // enum value has initializer
-                {
-                  typeDecl.writeString(" = ");
-                  typeDecl.parseText(fmd->initializer());
-                }
-              }
-
-              bool prevVisible = fmdVisible;
-              fmd=fmdl->next();
-              if (fmd && (fmdVisible=fmd->isBriefSectionVisible())) 
-              {
-                typeDecl.writeString(", ");
-              }
-              if (prevVisible)
-              {
-                typeDecl.disable(OutputGenerator::Man);
-                typeDecl.writeString("\n"); // to prevent too long lines in LaTeX
-                typeDecl.enable(OutputGenerator::Man);
-                enumMemCount++;
-              }
-            }
-            if (numVisibleEnumValues>enumValuesPerLine)
-            {
-              typeDecl.pushGeneratorState();
-              typeDecl.disableAllBut(OutputGenerator::Html);
-              typeDecl.lineBreak(); 
-              typeDecl.popGeneratorState();
-            }
-          }
-          typeDecl.docify(" }");
-          md->setEnumDecl(typeDecl);
-        }
-#endif
         int enumVars=0;
         MemberListIterator vmli(*this);
         MemberDef *vmd;
@@ -381,8 +267,11 @@ void MemberList::writePlainDeclarations(OutputList &ol,
       }
       case MemberDef::Friend:
       {
-        if (first) ol.startMemberList(),first=FALSE;
-        md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+        if (md->isBriefSectionVisible())
+        {
+          if (first) ol.startMemberList(),first=FALSE;
+          md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+        }
         break;
       }
       case MemberDef::EnumValue: 
@@ -400,10 +289,13 @@ void MemberList::writePlainDeclarations(OutputList &ol,
       if (md->fromAnonymousScope() && !md->anonymousDeclShown())
       {
         //printf("anonymous compound members\n");
-        if (first) ol.startMemberList(),first=FALSE;
-        md->setFromAnonymousScope(FALSE);
-        md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
-        md->setFromAnonymousScope(TRUE);
+        if (md->isBriefSectionVisible())
+        {
+          if (first) ol.startMemberList(),first=FALSE;
+          md->setFromAnonymousScope(FALSE);
+          md->writeDeclaration(ol,cd,nd,fd,gd,m_inGroup);
+          md->setFromAnonymousScope(TRUE);
+        }
       }
     }
   }