summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2000-05-22 18:35:23 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2000-05-22 18:35:23 (GMT)
commit745526b6e9683de926af27c4313574a514a3d7c3 (patch)
tree699a18c9a8c098fc845ba00c7eb093c73b497c5c /src/util.cpp
parent4f5775494986411db398172e98380acb76d5e3e6 (diff)
downloadDoxygen-745526b6e9683de926af27c4313574a514a3d7c3.zip
Doxygen-745526b6e9683de926af27c4313574a514a3d7c3.tar.gz
Doxygen-745526b6e9683de926af27c4313574a514a3d7c3.tar.bz2
Release-1.1.3-20000522
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/util.cpp b/src/util.cpp
index f20f8ab..275b754 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -221,7 +221,7 @@ ClassDef *getResolvedClass(const char *name)
}
if (count==10)
{
- warn("Warning: possible recursive typedef dependency detected for %s!\n",name);
+ warn_cont("Warning: possible recursive typedef dependency detected for %s!\n",name);
return classDict[name];
}
else
@@ -734,7 +734,7 @@ QCString fileToString(const char *name)
QFileInfo fi(name);
if (!fi.exists() || !fi.isFile())
{
- warn("Error: file `%s' not found\n",name);
+ err("Error: file `%s' not found\n",name);
return "";
}
f.setName(name);
@@ -742,7 +742,7 @@ QCString fileToString(const char *name)
}
if (!fileOpened)
{
- warn("Error: cannot open file `%s' for reading\n",name);
+ err("Error: cannot open file `%s' for reading\n",name);
return "";
}
int fsize=f.size();
@@ -2086,8 +2086,9 @@ FileDef *findFileDef(const FileNameDict *fnDict,const char *n,bool &ambig)
//----------------------------------------------------------------------
-void showFileDefMatches(const FileNameDict *fnDict,const char *n)
+QCString showFileDefMatches(const FileNameDict *fnDict,const char *n)
{
+ QCString result;
QCString name=n;
QCString path;
int slashPos=QMAX(name.findRev('/'),name.findRev('\\'));
@@ -2104,11 +2105,12 @@ void showFileDefMatches(const FileNameDict *fnDict,const char *n)
{
if (path.isEmpty() || fd->getPath().right(path.length())==path)
{
- msg(" %s\n",fd->absFilePath().data());
+ result+=" %s\n",fd->absFilePath().data();
}
fd=fn->next();
}
}
+ return result;
}
//----------------------------------------------------------------------
@@ -2281,11 +2283,15 @@ QCString insertTemplateSpecifierInScope(const QCString &scope,const QCString &te
if (!templ.isEmpty() && scope.find('<')==-1)
{
int si,pi=0;
- while ((si=scope.find("::",pi))!=-1 && !getClass(scope.left(si)+templ)
- && !getClass(scope.left(si)))
- { //printf("Tried `%s'\n",(scope.left(si)+templ).data());
- pi=si+2;
- }
+ ClassDef *cd=0;
+ while (
+ (si=scope.find("::",pi))!=-1 && !getClass(scope.left(si)+templ) &&
+ ((cd=getClass(scope.left(si)))==0 || cd->templateArguments()==0)
+ )
+ {
+ //printf("Tried `%s'\n",(scope.left(si)+templ).data());
+ pi=si+2;
+ }
if (si==-1) // not nested => append template specifier
{
result+=templ;