summaryrefslogtreecommitdiffstats
path: root/src/dirdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-09-13 17:26:00 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-09-13 17:26:00 (GMT)
commitf97a27a623aa6b8bfd8371630acf3b58efec251f (patch)
treee74e4a8d2b3a92ce8032ad6114a63f1ddb8fed48 /src/dirdef.cpp
parentbc6161ea636d54342e82f1f96b8d534dbd99c78b (diff)
downloadDoxygen-f97a27a623aa6b8bfd8371630acf3b58efec251f.zip
Doxygen-f97a27a623aa6b8bfd8371630acf3b58efec251f.tar.gz
Doxygen-f97a27a623aa6b8bfd8371630acf3b58efec251f.tar.bz2
Release-1.3.8-20040913
Diffstat (limited to 'src/dirdef.cpp')
-rw-r--r--src/dirdef.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/dirdef.cpp b/src/dirdef.cpp
index 38808f6..66ab173 100644
--- a/src/dirdef.cpp
+++ b/src/dirdef.cpp
@@ -207,6 +207,7 @@ void DirDef::writePathFragment(OutputList &ol)
if (getOuterScope()!=Doxygen::globalScope &&
getOuterScope()->definitionType()==Definition::TypeDir)
{
+ //printf("getOuterScope %s\n",getOuterScope()->name().data());
((DirDef*)getOuterScope())->writePathFragment(ol);
ol.writeString("&nbsp;/&nbsp;");
}
@@ -236,6 +237,7 @@ DirDef *DirDef::createNewDir(const char *path)
{
//printf("Adding new dir %s\n",path);
dir = new DirDef(path);
+ //printf("createNewDir %s short=%s\n",path,dir->shortName().data());
Doxygen::directories.inSort(path,dir);
}
return dir;
@@ -267,7 +269,7 @@ DirDef *DirDef::mergeDirectoryInTree(const QCString &path)
while ((i=path.find('/',p))!=-1)
{
QCString part=path.left(i+1);
- if (!matchPath(part,Config_getList("STRIP_FROM_PATH")))
+ if (!matchPath(part,Config_getList("STRIP_FROM_PATH")) && part!="/")
{
dir=createNewDir(part);
}
@@ -316,13 +318,16 @@ void buildDirectories()
//printf("New dir %s\n",dir->displayName().data());
QCString name = dir->name();
int i=name.findRev('/',name.length()-2);
- if (i!=-1)
+ if (i>0)
{
DirDef *parent = Doxygen::directories.find(name.left(i+1));
//if (parent==0) parent=root;
- if (parent) parent->addSubDir(dir);
- //printf("DirDef::addSubdir(): Adding subdir\n%s to\n%s\n",
- // dir->displayName().data(), parent->displayName().data());
+ if (parent)
+ {
+ parent->addSubDir(dir);
+ //printf("DirDef::addSubdir(): Adding subdir\n%s to\n%s\n",
+ // dir->displayName().data(), parent->displayName().data());
+ }
}
}
}