diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2003-05-24 19:12:41 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2003-05-24 19:12:41 (GMT) |
commit | ecdf7c392922b84a6a1803270104a448e2723c86 (patch) | |
tree | 5225a8b9c0898f1f3f89c69611439a6c5af1d178 /src/memberdef.cpp | |
parent | 20bd371f722f95bdf9da2d5c27753af4d38e7b6f (diff) | |
download | Doxygen-ecdf7c392922b84a6a1803270104a448e2723c86.zip Doxygen-ecdf7c392922b84a6a1803270104a448e2723c86.tar.gz Doxygen-ecdf7c392922b84a6a1803270104a448e2723c86.tar.bz2 |
Release-1.3-20030524
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r-- | src/memberdef.cpp | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 230096c..8416478 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -75,7 +75,7 @@ static QCString addTemplateNames(const QCString &s,const QCString &n,const QCStr } static void writeDefArgumentList(OutputList &ol,ClassDef *cd, - const QCString &scopeName,MemberDef *md) + const QCString & /*scopeName*/,MemberDef *md) { ArgumentList *defArgList=md->isDocsForDefinition() ? md->argumentList() : md->declArgumentList(); @@ -96,10 +96,6 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, Argument *a=defArgList->first(); QCString cName; - //if (md->scopeDefTemplateArguments()) - //{ - // cName=tempArgListToString(md->scopeDefTemplateArguments()); - //} if (cd) { cName=cd->name(); @@ -138,13 +134,13 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, //printf("a->type=`%s' a->name=`%s'\n",a->type.data(),a->name.data()); QCString n=a->type.left(vp); if (!cName.isEmpty()) n=addTemplateNames(n,cd->name(),cName); - linkifyText(TextGeneratorOLImpl(ol),scopeName,md->name(),n); + linkifyText(TextGeneratorOLImpl(ol),cd,md->name(),n); } else // non-function pointer type { QCString n=a->type; if (!cName.isEmpty()) n=addTemplateNames(n,cd->name(),cName); - linkifyText(TextGeneratorOLImpl(ol),scopeName,md->name(),n); + linkifyText(TextGeneratorOLImpl(ol),cd,md->name(),n); } if (!md->isDefine()) { @@ -169,7 +165,7 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, if (vp!=-1) // write the part of the argument type // that comes after the name { - linkifyText(TextGeneratorOLImpl(ol),scopeName, + linkifyText(TextGeneratorOLImpl(ol),cd, md->name(),a->type.right(a->type.length()-vp)); } if (!a->defval.isEmpty()) // write the default value @@ -177,7 +173,7 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, QCString n=a->defval; if (!cName.isEmpty()) n=addTemplateNames(n,cd->name(),cName); ol.docify(" = "); - linkifyText(TextGeneratorOLImpl(ol),scopeName,md->name(),n); + linkifyText(TextGeneratorOLImpl(ol),cd,md->name(),n); } a=defArgList->next(); if (a) @@ -799,21 +795,21 @@ void MemberDef::writeDeclaration(OutputList &ol, { if (getAnonymousEnumType()) // type is an anonymous enum { - linkifyText(TextGeneratorOLImpl(ol),cname,name(),ltype.left(i),TRUE); + linkifyText(TextGeneratorOLImpl(ol),d,name(),ltype.left(i),TRUE); getAnonymousEnumType()->writeEnumDeclaration(ol,cd,nd,fd,gd); //ol+=*getAnonymousEnumType()->enumDecl(); - linkifyText(TextGeneratorOLImpl(ol),cname,name(),ltype.right(ltype.length()-i-l),TRUE); + linkifyText(TextGeneratorOLImpl(ol),d,name(),ltype.right(ltype.length()-i-l),TRUE); } else { ltype = ltype.left(i) + " { ... } " + ltype.right(ltype.length()-i-l); - linkifyText(TextGeneratorOLImpl(ol),cname,name(),ltype,TRUE); + linkifyText(TextGeneratorOLImpl(ol),d,name(),ltype,TRUE); } } } else { - linkifyText(TextGeneratorOLImpl(ol),cname,name(),ltype,TRUE); + linkifyText(TextGeneratorOLImpl(ol),d,name(),ltype,TRUE); } bool htmlOn = ol.isEnabled(OutputGenerator::Html); if (htmlOn && Config_getBool("HTML_ALIGN_MEMBERS") && !ltype.isEmpty()) @@ -884,7 +880,7 @@ void MemberDef::writeDeclaration(OutputList &ol, { if (!isDefine()) ol.writeString(" "); //ol.docify(argsString()); - linkifyText(TextGeneratorOLImpl(ol),cname,name(),argsString()); + linkifyText(TextGeneratorOLImpl(ol),d,name(),argsString()); } if (excpString()) @@ -895,7 +891,7 @@ void MemberDef::writeDeclaration(OutputList &ol, if (!bitfields.isEmpty()) // add bitfields { - linkifyText(TextGeneratorOLImpl(ol),cname,name(),bitfields.simplifyWhiteSpace()); + linkifyText(TextGeneratorOLImpl(ol),d,name(),bitfields.simplifyWhiteSpace()); } else if (hasOneLineInitializer() //!init.isEmpty() && initLines==0 && // one line initializer @@ -905,12 +901,12 @@ void MemberDef::writeDeclaration(OutputList &ol, if (!isDefine()) { ol.writeString(" = "); - linkifyText(TextGeneratorOLImpl(ol),cname,name(),init.simplifyWhiteSpace()); + linkifyText(TextGeneratorOLImpl(ol),d,name(),init.simplifyWhiteSpace()); } else { ol.writeNonBreakableSpace(3); - linkifyText(TextGeneratorOLImpl(ol),cname,name(),init); + linkifyText(TextGeneratorOLImpl(ol),d,name(),init); } } @@ -1087,10 +1083,10 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { htmlHelp->addIndexItem(cname,name(),cfname,anchor()); } - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),ldef.left(i)); + linkifyText(TextGeneratorOLImpl(ol),container,name(),ldef.left(i)); //ol+=*vmd->enumDecl(); vmd->writeEnumDeclaration(ol,getClassDef(),getNamespaceDef(),getFileDef(),getGroupDef()); - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),ldef.right(ldef.length()-i-l)); + linkifyText(TextGeneratorOLImpl(ol),container,name(),ldef.right(ldef.length()-i-l)); found=TRUE; } @@ -1115,7 +1111,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, // last ei characters of ldef contain pointer/reference specifiers int ni=ldef.find("::",si); if (ni>=ei) ei=ni+2; - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),ldef.right(ldef.length()-ei)); + linkifyText(TextGeneratorOLImpl(ol),container,name(),ldef.right(ldef.length()-ei)); } } else // not an enum value @@ -1177,25 +1173,25 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, } } ol.startMemberDocName(); - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),ldef); + linkifyText(TextGeneratorOLImpl(ol),container,name(),ldef); writeDefArgumentList(ol,cd,scopeName,this); if (hasOneLineInitializer()) // add initializer { if (!isDefine()) { ol.docify(" = "); - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),init.simplifyWhiteSpace()); + linkifyText(TextGeneratorOLImpl(ol),container,name(),init.simplifyWhiteSpace()); } else { ol.writeNonBreakableSpace(3); - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),init); + linkifyText(TextGeneratorOLImpl(ol),container,name(),init); } } if (excpString()) // add exception list { ol.docify(" "); - linkifyText(TextGeneratorOLImpl(ol),scopeName,name(),excpString()); + linkifyText(TextGeneratorOLImpl(ol),container,name(),excpString()); } } @@ -1809,7 +1805,14 @@ void MemberDef::addListReference(Definition *d) Definition *pd=getOuterScope(); if (pd && pd!=Doxygen::globalScope) { - memName.prepend(pd->name()+"::"); + if (Config_getBool("OPTIMIZE_OUTPUT_JAVA")) + { + memName.prepend(pd->name()+"."); + } + else + { + memName.prepend(pd->name()+"::"); + } } } //printf("*** addListReference %s todo=%d test=%d bug=%d\n",name().data(),todoId(),testId(),bugId()); |