diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2011-11-17 21:22:48 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2011-11-17 21:22:48 (GMT) |
| commit | 720d85edd0316e1cedec3402e204ce418174305d (patch) | |
| tree | 0c7c3ab3d6f38e212b2cd4a4628e3c9d32d49db3 /src/classdef.cpp | |
| parent | 8491e9fbd06ef8a8f1cc542a524c673d7781d4b6 (diff) | |
| download | Doxygen-720d85edd0316e1cedec3402e204ce418174305d.zip Doxygen-720d85edd0316e1cedec3402e204ce418174305d.tar.gz Doxygen-720d85edd0316e1cedec3402e204ce418174305d.tar.bz2 | |
Release-1.7.5.1-20111117
Diffstat (limited to 'src/classdef.cpp')
| -rw-r--r-- | src/classdef.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 4dd9860..fd3aedf 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1774,7 +1774,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade { ol.writeString(" "); ol.insertMemberAlign(); - VhdlDocGen::writeClassType(this,ol,cname); + ol.writeString(VhdlDocGen::getProtectionName((VhdlDocGen::VhdlClasses)protection())); } ol.endMemberItem(); @@ -1962,12 +1962,7 @@ void ClassDef::writeDocumentation(OutputList &ol) endTitle(ol,getOutputFileBase(),displayName()); writeDocumentationContents(ol,pageTitle); - if (generateTreeView) - { - writeNavigationPath(ol); - } - - endFile(ol,TRUE); + endFileWithNavPath(this,ol); if (Config_getBool("SEPARATE_MEMBER_PAGES")) { @@ -3153,7 +3148,6 @@ void ClassDef::determineIntfUsageRelation() QCString ClassDef::compoundTypeString() const { - if (m_impl->compType==Interface && getLanguage()==SrcLangExt_ObjC) return "class"; if (getLanguage()==SrcLangExt_Fortran) { switch (m_impl->compType) @@ -3175,7 +3169,7 @@ QCString ClassDef::compoundTypeString() const case Class: return "class"; case Struct: return "struct"; case Union: return "union"; - case Interface: return "interface"; + case Interface: return getLanguage()==SrcLangExt_ObjC ? "class" : "interface"; case Protocol: return "protocol"; case Category: return "category"; case Exception: return "exception"; @@ -3714,7 +3708,7 @@ void ClassDef::writeMemberDeclarations(OutputList &ol,MemberList::ListType lt,co { if (getLanguage()==SrcLangExt_VHDL) // use specific declarations function { - VhdlDocGen::writeVhdlDeclarations(ml,ol,0,this,0); + VhdlDocGen::writeVhdlDeclarations(ml,ol,0,this,0,0); } else // use generic declaration function { |