summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-01-22 17:56:24 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-01-22 17:56:24 (GMT)
commit0df9adf5f52c9d36bb430da927684c4353b00396 (patch)
treed15a4da33ccd88d9f7ebd50a6090a12c90ccbae4 /src/classdef.cpp
parenta66e1ada3c7467e267ff39262178fa4577f0b6ab (diff)
downloadDoxygen-0df9adf5f52c9d36bb430da927684c4353b00396.zip
Doxygen-0df9adf5f52c9d36bb430da927684c4353b00396.tar.gz
Doxygen-0df9adf5f52c9d36bb430da927684c4353b00396.tar.bz2
Doxygen-1.2.13-20020122
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp24
1 files changed, 19 insertions, 5 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 762f8aa..5ea540f 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ * Copyright (C) 1997-2002 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -179,6 +179,18 @@ void ClassDef::addMembersToMemberGroup()
::addMembersToMemberGroup(&friends,memberGroupSDict,this);
::addMembersToMemberGroup(&related,memberGroupSDict,this);
::addMembersToMemberGroup(&properties,memberGroupSDict,this);
+
+ // add members inside sections to their groups
+ MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+ MemberGroup *mg;
+ for (;(mg=mgli.current());++mgli)
+ {
+ if (mg->allMembersInSameSection() && m_subGrouping)
+ {
+ //printf("addToDeclarationSection(%s)\n",mg->header().data());
+ mg->addToDeclarationSection();
+ }
+ }
}
// adds new member definition to the class
@@ -722,7 +734,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
}
ol.writeSynopsis();
- if (m_incInfo)
+ if (m_incInfo && Config_getBool("SHOW_INCLUDE_FILES"))
{
QCString nm=m_incInfo->includeName.isEmpty() ?
(m_incInfo->fileDef ?
@@ -992,7 +1004,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
else // add this group to the corresponding member section
{
//printf("addToDeclarationSection(%s)\n",mg->header().data());
- mg->addToDeclarationSection();
+ //mg->addToDeclarationSection();
}
}
@@ -1299,8 +1311,10 @@ void ClassDef::writeMemberList(OutputList &ol)
ol.writeString("</td>");
memberWritten=TRUE;
}
- else if (!Config_getBool("HIDE_UNDOC_MEMBERS")) // no documentation,
- // generate link to the class instead.
+ else if (!Config_getBool("HIDE_UNDOC_MEMBERS") &&
+ (md->protection()!=Private || Config_getBool("EXTRACT_PRIVATE") || md->isFriend())
+ ) // no documentation,
+ // generate link to the class instead.
{
//ol.writeListItem();
ol.writeString(" <tr bgcolor=\"#f0f0f0\"><td>");