summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-02-23 20:49:55 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-02-23 20:49:55 (GMT)
commit448b28836eb910f95e2f1903b4dea5eb8548e424 (patch)
tree4163d92b8a5b2126fe8413cc21df8eb3f247dbfa /src/doxygen.cpp
parent067ee3cfc7a79acd42cedb3f89713b9ed5f47f93 (diff)
downloadDoxygen-448b28836eb910f95e2f1903b4dea5eb8548e424.zip
Doxygen-448b28836eb910f95e2f1903b4dea5eb8548e424.tar.gz
Doxygen-448b28836eb910f95e2f1903b4dea5eb8548e424.tar.bz2
Doxygen-1.3-rc3-20030223
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp29
1 files changed, 20 insertions, 9 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 686bfff..ebd8182 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -108,6 +108,7 @@ QDict<void> Doxygen::expandAsDefinedDict(257); // all macros that should be e
QIntDict<MemberGroupInfo> Doxygen::memGrpInfoDict(1009); // dictionary of the member groups heading
PageInfo *Doxygen::mainPage = 0;
+bool Doxygen::insideMainPage = FALSE; // are we generating docs for the main page?
QTextStream Doxygen::tagFile;
NamespaceDef *Doxygen::globalScope = new NamespaceDef("<globalScope>",1,"<globalScope>");
@@ -2548,14 +2549,24 @@ static void transferFunctionDocumentation()
// copy group info.
- //if (mdec->getGroupDef()==0 && mdef->getGroupDef()!=0)
- //{
- // mdef->setGroupDef(mdec->getGroupDef(),mdec->getGroupPri(),mdec->docFile(),mdec->docLine(),mdec->hasDocumentation());
- //}
- //else if (mdef->getGroupDef()==0 && mdec->getGroupDef()!=0)
- //{
- // mdec->setGroupDef(mdef->getGroupDef(),mdef->getGroupPri(),mdef->docFile(),mdef->docLine(),mdef->hasDocumentation());
- //}
+ if (mdec->getGroupDef()==0 && mdef->getGroupDef()!=0)
+ {
+ mdec->setGroupDef(mdef->getGroupDef(),
+ mdef->getGroupPri(),
+ mdef->docFile(),
+ mdef->docLine(),
+ mdef->hasDocumentation()
+ );
+ }
+ else if (mdef->getGroupDef()==0 && mdec->getGroupDef()!=0)
+ {
+ mdef->setGroupDef(mdec->getGroupDef(),
+ mdec->getGroupPri(),
+ mdec->docFile(),
+ mdec->docLine(),
+ mdec->hasDocumentation()
+ );
+ }
mdec->mergeRefItems(mdef);
mdef->mergeRefItems(mdec);
@@ -7850,7 +7861,6 @@ void parseInput()
msg("Building member list...\n"); // using class info only !
buildFunctionList(root);
- transferFunctionDocumentation();
msg("Searching for friends...\n");
findFriends();
@@ -7884,6 +7894,7 @@ void parseInput()
msg("Searching for member function documentation...\n");
findMemberDocumentation(root); // may introduce new members !
transferRelatedFunctionDocumentation();
+ transferFunctionDocumentation();
msg("Searching for members imported via using declarations...\n");
findUsingDeclImports(root);