summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-02-16 21:11:17 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-02-16 21:11:17 (GMT)
commite2eb1d33d197604c048fb035fd1b6ecbd6a7494a (patch)
tree524eebded0dbf9efbc5b02ab15856f10f914ff99 /src/doxygen.cpp
parentf22ba481afa686d1a834e056963f8d41621aba88 (diff)
downloadDoxygen-e2eb1d33d197604c048fb035fd1b6ecbd6a7494a.zip
Doxygen-e2eb1d33d197604c048fb035fd1b6ecbd6a7494a.tar.gz
Doxygen-e2eb1d33d197604c048fb035fd1b6ecbd6a7494a.tar.bz2
Release-1.6.2-20100216
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index ff76488..f37bad1 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6617,6 +6617,7 @@ static void addEnumValuesToEnums(EntryNav *rootNav)
fmd->setMaxInitLines(root->initLines);
fmd->setMemberGroupId(root->mGrpId);
fmd->setExplicitExternal(root->explicitExternal);
+ fmd->setRefItems(root->sli);
if (fmd)
{
md->insertEnumField(fmd);
@@ -7737,6 +7738,16 @@ static void findDirDocumentation(EntryNav *rootNav)
QCString normalizedName = root->name;
normalizedName = substitute(normalizedName,"\\","/");
+ //printf("root->docFile=%s normalizedName=%s\n",
+ // root->docFile.data(),normalizedName.data());
+ if (root->docFile==normalizedName) // current dir?
+ {
+ int lastSlashPos=normalizedName.findRev('/');
+ if (lastSlashPos!=-1) // strip file name
+ {
+ normalizedName=normalizedName.left(lastSlashPos);
+ }
+ }
if (normalizedName.at(normalizedName.length()-1)!='/')
{
normalizedName+='/';
@@ -7774,7 +7785,7 @@ static void findDirDocumentation(EntryNav *rootNav)
else
{
warn(root->fileName,root->startLine,"Warning: No matching "
- "directory found for command \\dir %s\n",root->name.data());
+ "directory found for command \\dir %s\n",normalizedName.data());
}
rootNav->releaseEntry();
}