diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2010-12-24 16:12:24 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2010-12-24 16:12:24 (GMT) |
| commit | 48f4fd9c2d9ba8b374e3c052f888df9bc220df92 (patch) | |
| tree | 2e3f5d0757e53645fc902d0a87aa44dfd31d2d4d /src/memberdef.cpp | |
| parent | dd7602fdd31d8f3e0f88be553da084a1e3fdec45 (diff) | |
| download | Doxygen-48f4fd9c2d9ba8b374e3c052f888df9bc220df92.zip Doxygen-48f4fd9c2d9ba8b374e3c052f888df9bc220df92.tar.gz Doxygen-48f4fd9c2d9ba8b374e3c052f888df9bc220df92.tar.bz2 | |
Release-1.7.2-20101224
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 098c58e..be6a3a3 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -143,7 +143,6 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, } //printf("~~~ %s cName=%s\n",md->name().data(),cName.data()); - //if (!md->isDefine()) ol.startParameter(TRUE); else ol.docify(" "); bool first=TRUE; bool paramTypeStarted=FALSE; bool isDefine = md->isDefine(); @@ -166,10 +165,6 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, // use the following to put the function pointer type before the name bool hasFuncPtrType=FALSE; - // or use the following to put the function pointer as it appears in - // the prototype. - //bool hasFuncPtrType=vp!=-1 && wp!=-1 && wp<vp; - if (!a->attrib.isEmpty() && !md->isObjCMethod()) // argument has an IDL attribute { ol.docify(a->attrib+" "); @@ -208,10 +203,10 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, } if (!a->name.isEmpty() || (a->name.isEmpty() && a->type=="...")) // argument has a name { - if (!hasFuncPtrType) - { - ol.docify(" "); - } + //if (!hasFuncPtrType) + //{ + // ol.docify(" "); + //} ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Latex); ol.startEmphasis(); @@ -277,21 +272,12 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, ol.pushGeneratorState(); ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Latex); - //if (!first) ol.writeString(" "); if (!md->isObjCMethod()) ol.docify(")"); // end argument list ol.enableAll(); if (htmlOn) ol.enable(OutputGenerator::Html); if (latexOn) ol.enable(OutputGenerator::Latex); - //if (!isDefine) - { - if (first) ol.startParameterName(defArgList->count()<2); - ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod()); - } - //else // isDefine - //{ - // if (first) ol.startParameterName(TRUE); - // ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod()); - //} + if (first) ol.startParameterName(defArgList->count()<2); + ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod()); ol.popGeneratorState(); if (md->extraTypeChars()) { |