summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2008-04-20 08:30:56 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2008-04-20 08:30:56 (GMT)
commitb4f20f70abd663b3d8e5889e1fe582dfe980b7a2 (patch)
tree1ef12f6f2f4d51d8e4486b2d467e6f047ef9515a /src/classdef.cpp
parentc6c19d2984bfd7265b6d5f82336c991ec35727da (diff)
downloadDoxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.zip
Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.gz
Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.bz2
Release-1.5.5-20080420
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index f2edcda..5f4f391 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1075,6 +1075,12 @@ void ClassDef::writeClassDiagrams(OutputList &ol)
if (ok && bcd)
{
ClassDef *cd=bcd->classDef;
+
+ // use the class name but with the template arguments as given
+ // in the inheritance relation
+ QCString displayName = insertTemplateSpecifierInScope(
+ cd->name(),bcd->templSpecifiers);
+
if (cd->isLinkable())
{
if (!Config_getString("GENERATE_TAGFILE").isEmpty())
@@ -1098,11 +1104,11 @@ void ClassDef::writeClassDiagrams(OutputList &ol)
ol.writeObjectLink(cd->getReference(),
cd->getOutputFileBase(),
0,
- cd->displayName()+bcd->templSpecifiers);
+ displayName);
}
else
{
- ol.docify(cd->displayName());
+ ol.docify(displayName);
}
}
else
@@ -3384,3 +3390,15 @@ bool ClassDef::isUsedOnly() const
return m_impl->usedOnly;
}
+void ClassDef::reclassifyMember(MemberDef *md,MemberDef::MemberType t)
+{
+ md->setMemberType(t);
+ MemberList *ml = m_impl->memberLists.first();
+ while (ml)
+ {
+ ml->remove(md);
+ ml = m_impl->memberLists.next();
+ }
+ insertMember(md);
+}
+