summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2007-09-25 19:13:15 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2007-09-25 19:13:15 (GMT)
commitf57b7d974fec18d1d8f325c102efd8be5930131d (patch)
treebbe4c051e635c620ab57fcc7ca8279d0427777d8 /src/memberdef.cpp
parent8e4a092e4d51347f8f6c61d87154ee74edb13d20 (diff)
downloadDoxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.zip
Doxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.tar.gz
Doxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.tar.bz2
Release-1.5.3-20070925
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 49a1794..6591a37 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -85,10 +85,10 @@ static QCString addTemplateNames(const QCString &s,const QCString &n,const QCStr
static bool writeDefArgumentList(OutputList &ol,ClassDef *cd,
const QCString & /*scopeName*/,MemberDef *md)
{
- LockingPtr<ArgumentList> defArgList=(md->isDocsForDefinition() && !md->isProperty()) ?
+ LockingPtr<ArgumentList> defArgList=(md->isDocsForDefinition()) ?
md->argumentList() : md->declArgumentList();
//printf("writeDefArgumentList `%s' isDocsForDefinition()=%d\n",md->name().data(),md->isDocsForDefinition());
- if (defArgList==0)
+ if (defArgList==0 || md->isProperty())
{
return FALSE; // member has no function like argument list
}
@@ -771,7 +771,7 @@ QCString MemberDef::anchor() const
{
result=m_impl->groupMember->anchor();
}
- else
+ else if (getReference().isEmpty())
{
result.prepend("g");
}
@@ -2693,6 +2693,7 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl,
{
Doxygen::tagFile << " <member kind=\"enumeration\">" << endl;
Doxygen::tagFile << " <name>" << convertToXML(name()) << "</name>" << endl;
+ Doxygen::tagFile << " <anchorfile>" << convertToXML(getOutputFileBase()+Doxygen::htmlFileExtension) << "</anchorfile>" << endl;
Doxygen::tagFile << " <anchor>" << convertToXML(anchor()) << "</anchor>" << endl;
Doxygen::tagFile << " <arglist>" << convertToXML(argsString()) << "</arglist>" << endl;
Doxygen::tagFile << " </member>" << endl;
@@ -2741,6 +2742,7 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl,
{
Doxygen::tagFile << " <member kind=\"enumvalue\">" << endl;
Doxygen::tagFile << " <name>" << convertToXML(fmd->name()) << "</name>" << endl;
+ Doxygen::tagFile << " <anchorfile>" << convertToXML(getOutputFileBase()+Doxygen::htmlFileExtension) << "</anchorfile>" << endl;
Doxygen::tagFile << " <anchor>" << convertToXML(fmd->anchor()) << "</anchor>" << endl;
Doxygen::tagFile << " <arglist>" << convertToXML(fmd->argsString()) << "</arglist>" << endl;
Doxygen::tagFile << " </member>" << endl;