summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-12-24 19:52:54 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-12-24 19:52:54 (GMT)
commit76462e46e09cf3ed528e5d272562adadb05c8e08 (patch)
tree74b9c804cdbc689945d204f1c854e9bfa1ec5c01 /src/memberdef.cpp
parentfb864720e5a808a6e9052b2cc5a1a942cb7665ab (diff)
downloadDoxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.zip
Doxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.tar.gz
Doxygen-76462e46e09cf3ed528e5d272562adadb05c8e08.tar.bz2
Release-1.3-rc2-20021224
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 7015c08..bff8512 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -706,6 +706,11 @@ void MemberDef::writeDeclaration(OutputList &ol,
if (cd) d=cd; else if (nd) d=nd; else if (fd) d=fd; else d=gd;
QCString cname = d->name();
QCString cfname = d->getOutputFileBase();
+ QCString osname = cname;
+ // in case of class members that are put in a group the name of the outerscope
+ // differs from the cname.
+ if (getOuterScope()) osname=getOuterScope()->name();
+
HtmlHelp *htmlHelp=0;
bool hasHtmlHelp = Config_getBool("GENERATE_HTML") && Config_getBool("GENERATE_HTMLHELP");
@@ -926,7 +931,7 @@ void MemberDef::writeDeclaration(OutputList &ol,
!annMemb)
{
ol.startMemberDescription();
- ol.parseDoc(briefFile(),briefLine(),cname,this,briefDescription(),FALSE);
+ ol.parseDoc(briefFile(),briefLine(),osname,this,briefDescription(),FALSE);
if (detailsVisible)
{
ol.pushGeneratorState();
@@ -1590,8 +1595,8 @@ void MemberDef::warnIfUndocumented()
(prot!=Private || Config_getBool("EXTRACT_PRIVATE"))
)
{
- warn_undoc(m_defFileName,m_defLine,"Warning: Member %s of %s %s is not documented.",
- name().data(),t,d->name().data());
+ warn_undoc(m_defFileName,m_defLine,"Warning: Member %s%s of %s %s is not documented.",
+ name().data(),argsString()?argsString():"",t,d->name().data());
}
}