diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2000-05-14 18:44:15 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2000-05-14 18:44:15 (GMT) |
commit | 4f5775494986411db398172e98380acb76d5e3e6 (patch) | |
tree | aca56008d3ed43483f7f8f2f4fb55a3b4e5f75f2 /src/memberdef.cpp | |
parent | 367c98ad291fd02781ae1c20a6e09e0b07dbec88 (diff) | |
download | Doxygen-4f5775494986411db398172e98380acb76d5e3e6.zip Doxygen-4f5775494986411db398172e98380acb76d5e3e6.tar.gz Doxygen-4f5775494986411db398172e98380acb76d5e3e6.tar.bz2 |
Release-1.1.3-20000514
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r-- | src/memberdef.cpp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 1980587..dab56ea 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -73,6 +73,7 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, if (argList==0) return; // member has no function like argument list if (!md->isDefine()) ol.docify(" "); ol.docify("("); // start argument list + ol.endMemberDocName(); Argument *a=argList->first(); QCString cName; if (md->scopeDefTemplateArguments()) @@ -101,11 +102,11 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, } //printf("~~~ %s cName=%s\n",md->name().data(),cName.data()); + //if (!md->isDefine()) ol.startParameter(TRUE); else ol.docify(" "); + ol.startParameter(TRUE); bool first=TRUE; while (a) { - if (!md->isDefine()) ol.startParameter(first); else ol.docify(" "); - first=FALSE; QRegExp re(")("); int vp; if (!a->attrib.isEmpty()) // argument has an IDL attribute @@ -155,12 +156,17 @@ static void writeDefArgumentList(OutputList &ol,ClassDef *cd, if (a) { ol.docify(", "); // there are more arguments - if (!md->isDefine()) ol.endParameter(FALSE); + if (!md->isDefine()) + { + ol.endParameter(first); + ol.startParameter(FALSE); + } } + first=FALSE; } ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); - ol.writeString(" "); + if (!first) ol.writeString(" "); ol.popGeneratorState(); ol.docify(")"); // end argument list if (argList->constSpecifier) @@ -192,11 +198,11 @@ static void writeTemplatePrefix(OutputList &ol,ArgumentList *al,bool br=TRUE) ol.docify("> "); if (br) { - ol.pushGeneratorState(); - ol.disable(OutputGenerator::Man); - ol.disable(OutputGenerator::Latex); - ol.lineBreak(); - ol.popGeneratorState(); + // ol.pushGeneratorState(); + // ol.disable(OutputGenerator::Man); + // ol.disable(OutputGenerator::Latex); + // ol.lineBreak(); + // ol.popGeneratorState(); } } @@ -914,13 +920,17 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, // ) if (scopeAl && !related) // class template prefix { + ol.startMemberDocPrefixItem(); writeTemplatePrefix(ol,scopeAl); + ol.endMemberDocPrefixItem(); } if (scopeAl && membAl) ol.docify(" "); if (membAl) // function template prefix { + ol.startMemberDocPrefixItem(); writeTemplatePrefix(ol,membAl); + ol.endMemberDocPrefixItem(); } if (cd) { @@ -940,6 +950,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, def=addTemplateNames(def,cName,tempArgListToString(scopeAl)); } } + ol.startMemberDocName(); linkifyText(ol,scopeName,name(),def); writeDefArgumentList(ol,cd,scopeName,this); if (!init.isEmpty() && initLines==0) // add initializer |