summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2002-02-10 18:17:19 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2002-02-10 18:17:19 (GMT)
commit24f9a159dd76047cf03b92e7d71010947efaf164 (patch)
treed1468ce96ea2cb67fa7825027a3f93a67bf4d9a6 /src/classdef.cpp
parent1335cc7076d6a752c43c9a4eef958feef84d3edd (diff)
downloadDoxygen-24f9a159dd76047cf03b92e7d71010947efaf164.zip
Doxygen-24f9a159dd76047cf03b92e7d71010947efaf164.tar.gz
Doxygen-24f9a159dd76047cf03b92e7d71010947efaf164.tar.bz2
Release-1.2.13-20020210
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 0182c13..396d979 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -39,7 +39,7 @@
static QCString stripExtension(const char *fName)
{
QCString result=fName;
- if (result.right(5)==".html") result=result.left(result.length()-5);
+ if (result.right(htmlFileExtensionLength)==htmlFileExtension) result=result.left(result.length()-htmlFileExtensionLength);
return result;
}
@@ -701,6 +701,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
startFile(ol,getOutputFileBase(),name(),pageTitle);
startTitle(ol,getOutputFileBase());
parseText(ol,theTranslator->trCompoundReference(name(),m_compType,outerTempArgList!=0));
+ addGroupListToTitle(ol,this);
endTitle(ol,getOutputFileBase(),name());
ol.startTextBlock();
@@ -789,7 +790,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
Doxygen::tagFile << " <compound kind=\"" << compoundTypeString();
Doxygen::tagFile << "\">" << endl;
Doxygen::tagFile << " <name>" << convertToXML(name()) << "</name>" << endl;
- Doxygen::tagFile << " <filename>" << convertToXML(getOutputFileBase()) << ".html</filename>" << endl;
+ Doxygen::tagFile << " <filename>" << convertToXML(getOutputFileBase()) << htmlFileExtension << "</filename>" << endl;
if (m_tempArgs)
{
ArgumentListIterator ali(*m_tempArgs);
@@ -929,7 +930,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Html);
ol.writeString("<center><font size=\"2\">[");
- ol.startHtmlLink("graph_legend.html");
+ ol.startHtmlLink("graph_legend"+htmlFileExtension);
ol.docify(theTranslator->trLegend());
ol.endHtmlLink();
ol.writeString("]</font></center>");
@@ -964,7 +965,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Html);
ol.writeString("<center><font size=\"2\">[");
- ol.startHtmlLink("graph_legend.html");
+ ol.startHtmlLink("graph_legend"+htmlFileExtension);
ol.docify(theTranslator->trLegend());
ol.endHtmlLink();
ol.writeString("]</font></center>");
@@ -1727,7 +1728,7 @@ void ClassDef::mergeMembers()
// argListToString(srcMd->argumentList()).data(),
// argListToString(dstMd->argumentList()).data(),
// found);
- hidden = hidden || !found;
+ hidden = hidden || !found;
}
else // member is in a non base class => multiple inheritance
// using the same base class.
@@ -1746,10 +1747,12 @@ void ClassDef::mergeMembers()
else // same members
{
// do not add if base class is virtual or
- // if scope paths are equal
+ // if scope paths are equal or
+ // if base class is an interface (and thus implicitly virtual).
//printf("same member found srcMi->virt=%d dstMi->virt=%d\n",srcMi->virt,dstMi->virt);
if ((srcMi->virt!=Normal && dstMi->virt!=Normal) ||
- bClass->name()+"::"+srcMi->scopePath == dstMi->scopePath
+ bClass->name()+"::"+srcMi->scopePath == dstMi->scopePath ||
+ dstMd->getClassDef()->compoundType()==ClassDef::Interface
)
{
found=TRUE;
@@ -1783,17 +1786,23 @@ void ClassDef::mergeMembers()
// this case is shown anyway.
if (!found && srcMd->protection()!=Private)
{
+ Protection prot=srcMd->protection();
+ if (bcd->prot==Protected && prot==Public) prot=bcd->prot;
+ else if (bcd->prot==Private) prot=bcd->prot;
+
if (inlineInheritedMembers)
{
if (!isStandardFunc(srcMd))
{
//printf(" insertMember `%s'\n",srcMd->name().data());
- internalInsertMember(srcMd,bcd->prot,FALSE);
+ internalInsertMember(srcMd,prot,FALSE);
}
}
+
Specifier virt=srcMi->virt;
if (srcMi->virt==Normal && bcd->virt!=Normal) virt=bcd->virt;
- MemberInfo *newMi = new MemberInfo(srcMd,bcd->prot,virt,TRUE);
+
+ MemberInfo *newMi = new MemberInfo(srcMd,prot,virt,TRUE);
newMi->scopePath=bClass->name()+"::"+srcMi->scopePath;
if (ambigue)
{