summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-08-03 16:49:33 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-08-03 16:49:33 (GMT)
commit6e8975abdb6b52477a5788bca969e13e467814dd (patch)
tree947221d2f202d586f7f386c57472cc941980963f /src/util.cpp
parente305d80490e1fb2dc15eb9cf9ee13428936c8e16 (diff)
downloadDoxygen-6e8975abdb6b52477a5788bca969e13e467814dd.zip
Doxygen-6e8975abdb6b52477a5788bca969e13e467814dd.tar.gz
Doxygen-6e8975abdb6b52477a5788bca969e13e467814dd.tar.bz2
Release-1.3.8-20040803
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 193dded..f2ef4c3 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1010,7 +1010,6 @@ ClassDef *getResolvedClassRec(Definition *scope,
QCString name=n;
QCString explicitScopePart;
- //int qualifierIndex = name.findRev("::"); // todo: deal with cases like A<B::C>
int qualifierIndex = computeQualifiedIndex(name);
//printf("name=%s qualifierIndex=%d\n",name.data(),qualifierIndex);
if (qualifierIndex!=-1) // qualified name
@@ -1032,7 +1031,6 @@ ClassDef *getResolvedClassRec(Definition *scope,
//printf("Looking for symbol %s result=%p\n",name.data(),dl);
if (dl==0)
{
- // name is not a known symbol
return 0;
}
@@ -1181,7 +1179,7 @@ ClassDef *getResolvedClass(Definition *scope,
}
//printf("getResolvedClass(%s,%s)=%s\n",scope?scope->name().data():"<global>",
// n,result?result->name().data():"<none>");
- //
+
return result;
}
@@ -4120,14 +4118,22 @@ QCString substituteTemplateArgumentsInString(
++formAli,actArg=actualArgs->next()
)
{
- //printf("n=%s formArg->type=%s formArg->name=%s\n",
- // n.data(),formArg->type.data(),formArg->name.data());
if (formArg->type=="class" || formArg->type=="typename")
{
+ //printf("n=%s formArg->type=%s formArg->name=%si formArg->defval=%s\n",
+ // n.data(),formArg->type.data(),formArg->name.data(),formArg->defval.data());
if (formArg->name==n && actArg && !actArg->type.isEmpty()) // base class is a template argument
{
// replace formal argument with the actual argument of the instance
- result += actArg->type+" ";
+ if (actArg->name.isEmpty())
+ {
+ result += actArg->type+" ";
+ }
+ else // for case where the actual arg is something like "unsigned int"
+ // the "int" part is in actArg->name.
+ {
+ result += actArg->type+" "+actArg->name+" ";
+ }
found=TRUE;
}
else if (formArg->name==n && actArg==0 && !formArg->defval.isEmpty() &&