summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2005-09-18 19:25:32 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2005-09-18 19:25:32 (GMT)
commitba7233b1be8545e619d80a62dd274521392fbe1f (patch)
treeb25e22f178d0e6d1ebb7e74f2348e9811a2f5394 /src/util.cpp
parent143b39e71a45892c2b8e8bf22f5d448b441bf36a (diff)
downloadDoxygen-ba7233b1be8545e619d80a62dd274521392fbe1f.zip
Doxygen-ba7233b1be8545e619d80a62dd274521392fbe1f.tar.gz
Doxygen-ba7233b1be8545e619d80a62dd274521392fbe1f.tar.bz2
Release-1.4.4-20050918
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 912c6dc..8cf4ba5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1000,7 +1000,7 @@ done:
return result;
}
-int computeQualifiedIndex(const QString &name)
+int computeQualifiedIndex(const QCString &name)
{
int i = name.find('<');
return name.findRev("::",i==-1 ? name.length() : i);
@@ -1136,15 +1136,18 @@ ClassDef *getResolvedClassRec(Definition *scope,
// see if we are dealing with a class or a typedef
if (d->definitionType()==Definition::TypeClass) // d is a class
{
- if (!((ClassDef*)d)->isTemplateArgument()) // skip classes that
- // are only there to
- // represent a template
- // argument
+ ClassDef *cd = (ClassDef *)d;
+ //printf("cd=%s\n",cd->name().data());
+ if (!cd->isTemplateArgument()) // skip classes that
+ // are only there to
+ // represent a template
+ // argument
{
+ //printf("is not a templ arg\n");
if (distance<minDistance) // found a definition that is "closer"
{
minDistance=distance;
- bestMatch = (ClassDef *)d;
+ bestMatch = cd;
bestTypedef = 0;
bestTemplSpec.resize(0);
}
@@ -1164,7 +1167,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
// Just a non-perfect heuristic but it could help in some situations
// (kdecore code is an example).
minDistance=distance;
- bestMatch = (ClassDef *)d;
+ bestMatch = cd;
bestTypedef = 0;
bestTemplSpec.resize(0);
}
@@ -5605,7 +5608,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s)
p=s.data()+b;
while (b>=0)
{
- c=*--p;
+ c=*p; p--;
if (c==' ' || c=='\t' || c=='\r') b--;
else if (c=='\n') bi=b,b--;
else break;