summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-07-12 12:19:00 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-07-12 12:19:00 (GMT)
commit858d65a9cd7b9b7cf71da01098f47d583b3322f5 (patch)
tree965217503677442e224e80549bee3d0aea3a7857 /src/memberdef.cpp
parent5b735d5118581e3bca686f79de341b8b2e76691f (diff)
parent56c60e84e6dd6d7e4e7774be24d1402782fd3230 (diff)
downloadDoxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.zip
Doxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.tar.gz
Doxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.tar.bz2
Merge branch 'feature/bug_tableofcontents_latex' of https://github.com/albert-github/doxygen into feature/bug_tableofcontents_latex
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp4
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_");