summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2010-03-24 20:39:59 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2010-03-24 20:39:59 (GMT)
commit707831ea739af5ae137c9cc1d04e3ffbbde11a6a (patch)
tree1e47a4443afb2ec61f032669050ee1b8834baa8d /src/doxygen.cpp
parent23b0a90048405fda4e4304052c3c1277c33a6a2b (diff)
downloadDoxygen-707831ea739af5ae137c9cc1d04e3ffbbde11a6a.zip
Doxygen-707831ea739af5ae137c9cc1d04e3ffbbde11a6a.tar.gz
Doxygen-707831ea739af5ae137c9cc1d04e3ffbbde11a6a.tar.bz2
Release-1.6.3-20100324
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e3fffb3..87e66d1 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -5687,13 +5687,26 @@ static void findMember(EntryNav *rootNav,
}
else if (cd) // member specialization
{
+ MemberNameIterator mni(*mn);
+ MemberDef *declMd=0;
+ MemberDef *md=0;
+ for (mni.toFirst();(md=mni.current());++mni)
+ {
+ if (md->getClassDef()==cd)
+ {
+ // TODO: we should probably also check for matching arguments
+ declMd = md;
+ break;
+ }
+ }
MemberDef::MemberType mtype=MemberDef::Function;
ArgumentList *tArgList = new ArgumentList;
// getTemplateArgumentsFromName(cd->name()+"::"+funcName,root->tArgLists);
- MemberDef *md=new MemberDef(
+ md=new MemberDef(
root->fileName,root->startLine,
funcType,funcName,funcArgs,exceptions,
- root->protection,root->virt,root->stat,Member,
+ declMd ? declMd->protection() : root->protection,
+ root->virt,root->stat,Member,
mtype,tArgList,root->argList);
//printf("new specialized member %s args=`%s'\n",md->name().data(),funcArgs.data());
md->setTagInfo(rootNav->tagInfo());
@@ -8040,7 +8053,7 @@ static void buildExampleList(EntryNav *rootNav)
{
PageDef *pd=new PageDef(root->fileName,root->startLine,
root->name,root->brief+root->doc+root->inbodyDocs,root->args);
- pd->setFileName(convertNameToFile(pd->name()+"-example",TRUE,FALSE));
+ pd->setFileName(convertNameToFile(pd->name()+"-example"));
pd->addSectionsToDefinition(root->anchors);
//pi->addSections(root->anchors);
@@ -10187,7 +10200,7 @@ void generateOutput()
Doxygen::indexList.addImageFile("tab_b.gif");
Doxygen::indexList.addStyleSheetFile("tabs.css");
Doxygen::indexList.addImageFile("doxygen.png");
- if (Config_getBool("HTML_DYNAMIC_SECTIONS")) HtmlGenerator::generateSectionImages();
+ //if (Config_getBool("HTML_DYNAMIC_SECTIONS")) HtmlGenerator::generateSectionImages();
copyStyleSheet();
}
if (Config_getBool("GENERATE_LATEX"))
@@ -10276,7 +10289,6 @@ void generateOutput()
exit(1);
}
HtmlGenerator::writeSearchData(searchDirName);
- writeSearchStyleSheet();
if (!serverBasedSearch) // client side search index
{
writeJavascriptSearchIndex();