diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-06-24 08:57:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 08:57:30 (GMT) |
| commit | 56c60e84e6dd6d7e4e7774be24d1402782fd3230 (patch) | |
| tree | 4341e26d4bf860fec4c5784b042a5c9130ae2da4 /src/memberdef.cpp | |
| parent | ba30b13cfd4910a5913f080a039fc429ec8a7e3f (diff) | |
| parent | 154e877cc2e8b10091d7e0068b6f6d5793cd29f3 (diff) | |
| download | Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.zip Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.gz Doxygen-56c60e84e6dd6d7e4e7774be24d1402782fd3230.tar.bz2 | |
Merge branch 'master' into feature/bug_tableofcontents_latex
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 0bd0701..819904f 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1978,7 +1978,7 @@ void MemberDef::getLabels(QStrList &sl,Definition *container) const bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (optVhdl) { - sl.append(VhdlDocGen::trTypeString(getMemberSpecifiers())); + sl.append(theTranslator->trVhdlType(getMemberSpecifiers(),TRUE)); } else { @@ -2576,7 +2576,7 @@ void MemberDef::writeDocumentation(MemberList *ml, else if (getFileDef()) { scopeName=getFileDef()->displayName(); scopedContainer=getFileDef(); } ciname = ((GroupDef *)container)->groupTitle(); } - else if (container->definitionType()==TypeFile && getNamespaceDef()) + else if (container->definitionType()==TypeFile && getNamespaceDef() && lang != SrcLangExt_Python) { // member is in a namespace, but is written as part of the file documentation // as well, so we need to make sure its label is unique. memAnchor.prepend("file_"); |