summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2006-06-11 07:58:28 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2006-06-11 07:58:28 (GMT)
commit9dbdf881dc5f0644777cc5732e7751325b508c91 (patch)
tree30cd22ecad5caf15fa470d190298c4e98b02e971 /src/classdef.cpp
parent0674d909555d4b1fe1e000425195ef33b00fe1a5 (diff)
downloadDoxygen-9dbdf881dc5f0644777cc5732e7751325b508c91.zip
Doxygen-9dbdf881dc5f0644777cc5732e7751325b508c91.tar.gz
Doxygen-9dbdf881dc5f0644777cc5732e7751325b508c91.tar.bz2
Release-1.4.7
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index cea3d69..5450b46 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -2055,22 +2055,27 @@ bool ClassDef::isLinkable() const
/*! the class is visible in a class diagram, or class hierarchy */
bool ClassDef::isVisibleInHierarchy()
{
- return // show all classes or a subclass is visible
- (Config_getBool("ALLEXTERNALS") || hasNonReferenceSuperClass()) &&
+ static bool allExternals = Config_getBool("ALLEXTERNALS");
+ static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE");
+ static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES");
+ static bool extractStatic = Config_getBool("EXTRACT_STATIC");
+
+ return // show all classes or a subclass is visible
+ (allExternals || hasNonReferenceSuperClass()) &&
// and not an annonymous compound
name().find('@')==-1 &&
// not an artifically introduced class
!m_artificial &&
// and not privately inherited
- (m_prot!=Private || Config_getBool("EXTRACT_PRIVATE")) &&
+ (m_prot!=Private || extractPrivate) &&
// documented or shown anyway or documentation is external
(hasDocumentation() ||
- !Config_getBool("HIDE_UNDOC_CLASSES") ||
+ !hideUndocClasses ||
(m_templateMaster && m_templateMaster->hasDocumentation()) ||
isReference()
) &&
// is not part of an unnamed namespace or shown anyway
- (!m_isStatic || Config_getBool("EXTRACT_STATIC"));
+ (!m_isStatic || extractStatic);
}
bool ClassDef::hasDocumentation() const