diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-06-03 09:24:48 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-06-03 09:24:48 (GMT) |
| commit | 6d2875bda7b5416f2e8c72ec8677b7164de86187 (patch) | |
| tree | 060dc6ccdb347682a1d4b73ab3098d95599532f2 /src/memberdef.cpp | |
| parent | 0fb3f32dfd7ac31a2677d76647700cd3fb730ef6 (diff) | |
| download | Doxygen-6d2875bda7b5416f2e8c72ec8677b7164de86187.zip Doxygen-6d2875bda7b5416f2e8c72ec8677b7164de86187.tar.gz Doxygen-6d2875bda7b5416f2e8c72ec8677b7164de86187.tar.bz2 | |
Release-1.6.3-20100603
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index e7fa89e..3c6dfd2 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -146,12 +146,18 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, //if (!md->isDefine()) ol.startParameter(TRUE); else ol.docify(" "); bool first=TRUE; bool paramTypeStarted=FALSE; + bool isDefine = md->isDefine(); while (a) { - if (md->isDefine() || first) + if (isDefine || first) { ol.startParameterType(first,md->isObjCMethod()?"dummy":0); paramTypeStarted=TRUE; + if (isDefine) + { + ol.endParameterType(); + ol.startParameterName(TRUE); + } } QRegExp re(")("),res("(.*\\*"); int vp=a->type.find(re); @@ -187,7 +193,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, linkifyText(TextGeneratorOLImpl(ol),cd,md->getBodyDef(),md->name(),n); } } - if (!md->isDefine()) + if (!isDefine) { if (paramTypeStarted) { @@ -243,7 +249,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, if (a) { if (!md->isObjCMethod()) ol.docify(", "); // there are more arguments - if (!md->isDefine()) + if (!isDefine) { QCString key; if (md->isObjCMethod() && a->attrib.length()>=2) @@ -261,7 +267,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, ol.startParameterType(FALSE,key); paramTypeStarted=TRUE; } - else + else // isDefine { ol.endParameterName(FALSE,FALSE,TRUE); } @@ -276,17 +282,16 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, ol.enableAll(); if (htmlOn) ol.enable(OutputGenerator::Html); if (latexOn) ol.enable(OutputGenerator::Latex); - if (!md->isDefine()) + //if (!isDefine) { if (first) ol.startParameterName(defArgList->count()<2); ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod()); } - else - { - ol.endParameterType(); - ol.startParameterName(TRUE); - ol.endParameterName(TRUE,TRUE,!md->isObjCMethod()); - } + //else // isDefine + //{ + // if (first) ol.startParameterName(TRUE); + // ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod()); + //} ol.popGeneratorState(); if (md->extraTypeChars()) { |