summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-11-11 19:20:29 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-11-11 19:20:29 (GMT)
commit613b33d7ce00236865f41d77e4e39b37dcbef17b (patch)
tree7d80c173dcecb625806ece76ccd2210dca925e13 /src/doxygen.cpp
parenta29cfb7d102b893c56c1342fc738b788fc4885cf (diff)
downloadDoxygen-613b33d7ce00236865f41d77e4e39b37dcbef17b.zip
Doxygen-613b33d7ce00236865f41d77e4e39b37dcbef17b.tar.gz
Doxygen-613b33d7ce00236865f41d77e4e39b37dcbef17b.tar.bz2
Release-1.2.11-20011111
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 005fb56..6db5d5d 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2101,11 +2101,13 @@ static void findFriends()
{
mmd->setBodySegment(fmd->getStartBodyLine(),fmd->getEndBodyLine());
mmd->setBodyDef(fmd->getBodyDef());
+ mmd->setBodyMember(fmd);
}
else if (mmd->getStartBodyLine()!=-1 && fmd->getStartBodyLine()==-1)
{
fmd->setBodySegment(mmd->getStartBodyLine(),mmd->getEndBodyLine());
fmd->setBodyDef(mmd->getBodyDef());
+ fmd->setBodyMember(mmd);
}
}
}
@@ -2180,12 +2182,14 @@ static void transferFunctionDocumentation()
if (mdec->getStartBodyLine()!=-1 && mdef->getStartBodyLine()==-1)
{
mdef->setBodySegment(mdec->getStartBodyLine(),mdec->getEndBodyLine());
- mdef->setBodyDef(mdec->getFileDef());
+ mdef->setBodyDef(mdec->getBodyDef());
+ mdef->setBodyMember(mdec);
}
else if (mdef->getStartBodyLine()!=-1 && mdec->getStartBodyLine()==-1)
{
mdec->setBodySegment(mdef->getStartBodyLine(),mdef->getEndBodyLine());
- mdec->setBodyDef(mdef->getFileDef());
+ mdec->setBodyDef(mdef->getBodyDef());
+ mdec->setBodyMember(mdef);
}
mdec->mergeMemberSpecifiers(mdef->getMemberSpecifiers());
mdef->mergeMemberSpecifiers(mdec->getMemberSpecifiers());
@@ -6194,7 +6198,12 @@ static int readFileOrDirectory(const char *s,
bool errorIfNotExist=TRUE
)
{
- QFileInfo fi(s);
+ // strip trailing slashes
+ QCString fs = s;
+ char lc = fs.at(fs.length()-1);
+ if (lc=='/' || lc=='\\') fs = fs.left(fs.length()-1);
+
+ QFileInfo fi(fs);
//printf("readFileOrDirectory(%s)\n",s);
int totalSize=0;
{
@@ -6666,12 +6675,12 @@ void parseInput()
s=imagePathList.next();
}
- QDictIterator<FileName> fndi(*Doxygen::imageNameDict);
- FileName *fn;
- for (;(fn=fndi.current());++fndi)
- {
- printf("File Name %s\n",fn->fileName());
- }
+ //QDictIterator<FileName> fndi(*Doxygen::imageNameDict);
+ //FileName *fn;
+ //for (;(fn=fndi.current());++fndi)
+ //{
+ // printf("File Name %s\n",fn->fileName());
+ //}
msg("Searching for dot files...\n");