summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2000-08-13 17:49:57 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2000-08-13 17:49:57 (GMT)
commit5ce25000172e185e0ca5b9f20538f80cbbfe0b0e (patch)
tree69018221b85af2e6f7d24d25d207dd6fdc8795ad /src/memberdef.cpp
parentc4ef46195917656ebebed63e3fab5c135d9905a2 (diff)
downloadDoxygen-5ce25000172e185e0ca5b9f20538f80cbbfe0b0e.zip
Doxygen-5ce25000172e185e0ca5b9f20538f80cbbfe0b0e.tar.gz
Doxygen-5ce25000172e185e0ca5b9f20538f80cbbfe0b0e.tar.bz2
Release-1.2.1
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index f64950f..266c45c 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -234,7 +234,7 @@ MemberDef::MemberDef(const char *df,int dl,
const char *t,const char *na,const char *a,const char *e,
Protection p,Specifier v,bool s,bool r,MemberType mt,
const ArgumentList *tal,const ArgumentList *al
- ) : Definition(df,dl,substituteClassNames(na))
+ ) : Definition(df,dl,na)
{
//printf("++++++ MemberDef(%s file=%s,line=%d) ++++++ \n",na,df,dl);
classDef=0;
@@ -255,8 +255,8 @@ MemberDef::MemberDef(const char *df,int dl,
scopeTAL=0;
membTAL=0;
initLines=0;
- type=substituteClassNames(t);
- args=substituteClassNames(a);
+ type=t;
+ args=a;
if (type.isEmpty()) decl=name()+args; else decl=type+" "+name()+args;
declLine=0;
memberGroup=0;
@@ -1025,6 +1025,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
ol.startBold();
parseText(ol,theTranslator->trInitialValue());
ol.endBold();
+ initParseCodeContext();
ol.startCodeFragment();
parseCode(ol,scopeName,init,FALSE,0);
ol.endCodeFragment();
@@ -1400,7 +1401,7 @@ void MemberDef::generateXML(QTextStream &t,Definition *def)
scopeName=getNamespaceDef()->name();
t << " <";
- enum { define_t,variable_t,typedef_t,enum_t,function_t } xmlType;
+ enum { define_t,variable_t,typedef_t,enum_t,function_t } xmlType = function_t;
switch (mtype)
{
case Define: t << "definedef"; xmlType=define_t; break;