summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-08-04 18:23:05 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-04 18:23:05 (GMT)
commit9451c09694970ee9856cdf798967c0c463d72ffa (patch)
treec80cc6eee6c5eced38ee229c7df7de609b77d49b /src
parentcfde6cdd600b21bba6a2eb0ca0e7e208e014ccaf (diff)
parent34a5a051a8b91215ae4f93e5541d43c33aa887c1 (diff)
downloadDoxygen-9451c09694970ee9856cdf798967c0c463d72ffa.zip
Doxygen-9451c09694970ee9856cdf798967c0c463d72ffa.tar.gz
Doxygen-9451c09694970ee9856cdf798967c0c463d72ffa.tar.bz2
Merge branch 'master' of https://github.com/groleo/doxygen-1 into groleo-master
Diffstat (limited to 'src')
-rw-r--r--src/classdef.cpp19
-rw-r--r--src/classdef.h2
2 files changed, 18 insertions, 3 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 522a53c..b32d5a8 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -187,6 +187,8 @@ class ClassDefImpl
bool isGeneric;
+ bool isAnonymous;
+
uint64 spec;
};
@@ -248,6 +250,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name,
isLocal=FALSE;
}
isGeneric = lang==SrcLangExt_CSharp && QCString(name).find('<')!=-1;
+ isAnonymous = QCString(name).find('@')!=-1;
}
ClassDefImpl::ClassDefImpl() : vhdlSummaryTitles(17)
@@ -1772,7 +1775,7 @@ bool ClassDef::visibleInParentsDeclList() const
static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES");
static bool extractLocalClasses = Config_getBool("EXTRACT_LOCAL_CLASSES");
bool linkable = isLinkable();
- return (name().find('@')==-1 && !isExtension() &&
+ return (!isAnonymous() && !isExtension() &&
(protection()!=::Private || extractPrivate) &&
(linkable || (!hideUndocClasses && (!isLocal() || extractLocalClasses)))
);
@@ -2597,7 +2600,7 @@ bool ClassDef::isLinkableInProject() const
{
return !name().isEmpty() && /* has a name */
!isArtificial() && !isHidden() && /* not hidden */
- name().find('@')==-1 && /* not anonymous */
+ !isAnonymous() && /* not anonymous */
protectionLevelVisible(m_impl->prot) && /* private/internal */
(!m_impl->isLocal || extractLocal) && /* local */
(hasDocumentation() || !hideUndoc) && /* documented */
@@ -2629,7 +2632,7 @@ bool ClassDef::isVisibleInHierarchy()
return // show all classes or a subclass is visible
(allExternals || hasNonReferenceSuperClass()) &&
// and not an anonymous compound
- name().find('@')==-1 &&
+ !isAnonymous() &&
// not an artificially introduced class
/*!isArtificial() &&*/ // 1.8.2: allowed these to appear
// and not privately inherited
@@ -4608,3 +4611,13 @@ bool ClassDef::subGrouping() const
return m_impl->subGrouping;
}
+void ClassDef::setName(const char *name)
+{
+ m_impl->isAnonymous = QCString(name).find('@')!=-1;
+ Definition::setName(name);
+}
+
+bool ClassDef::isAnonymous() const
+{
+ return m_impl->isAnonymous;
+}
diff --git a/src/classdef.h b/src/classdef.h
index dee4ef4..9f0ae5f 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -310,6 +310,7 @@ class ClassDef : public Definition
bool isJavaEnum() const;
bool isGeneric() const;
+ bool isAnonymous() const;
const ClassSDict *innerClasses() const;
QCString title() const;
@@ -360,6 +361,7 @@ class ClassDef : public Definition
void addTaggedInnerClass(ClassDef *cd);
void setTagLessReference(ClassDef *cd);
+ void setName(const char *name);
//-----------------------------------------------------------------------------------
// --- actions ----