summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-03-07 21:00:29 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2004-03-07 21:00:29 (GMT)
commitf12fe31aed103718f5d4c368473302cc6ac82a47 (patch)
treeecc570be1c038ecdb55dda6d9ffe794945151261 /src/classdef.cpp
parent5edb3c85109d09e5fa43529bf8b584382f7501a5 (diff)
downloadDoxygen-f12fe31aed103718f5d4c368473302cc6ac82a47.zip
Doxygen-f12fe31aed103718f5d4c368473302cc6ac82a47.tar.gz
Doxygen-f12fe31aed103718f5d4c368473302cc6ac82a47.tar.bz2
Release-1.3.6-20040307
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index ffc6779..7721925 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1371,10 +1371,10 @@ void ClassDef::writeDocumentation(OutputList &ol)
// write the list of used files (not for man pages)
ol.pushGeneratorState();
+ ol.disable(OutputGenerator::Man);
if (Config_getBool("SHOW_USED_FILES"))
{
- ol.disable(OutputGenerator::Man);
ol.writeRuler();
ol.parseText(theTranslator->trGeneratedFromFiles(
m_isObjC && m_compType==Interface ? Class : m_compType,
@@ -1633,7 +1633,7 @@ void ClassDef::writeMemberList(OutputList &ol)
ol.writeString("<td>");
}
if (
- (prot!=Public || virt!=Normal ||
+ (prot!=Public || (virt!=Normal && !m_isObjC) ||
md->isFriend() || md->isRelated() || md->isExplicit() ||
md->isMutable() || (md->isInline() && Config_getBool("INLINE_INFO")) ||
md->isSignal() || md->isSlot() ||
@@ -1655,7 +1655,8 @@ void ClassDef::writeMemberList(OutputList &ol)
if (prot==Protected) sl.append("protected");
else if (prot==Private) sl.append("private");
else if (prot==Package) sl.append("package");
- if (virt==Virtual) sl.append("virtual");
+ if (virt==Virtual &&
+ !m_isObjC) sl.append("virtual");
else if (virt==Pure) sl.append("pure virtual");
if (md->isStatic()) sl.append("static");
if (md->isSignal()) sl.append("signal");
@@ -2572,7 +2573,7 @@ ClassDef *ClassDef::insertTemplateInstance(const QCString &fileName,
ClassDef *templateClass=m_templateInstances->find(templSpec);
if (templateClass==0)
{
- Debug::print(Debug::Classes,0," New template instance class %s%s\n",name().data(),templSpec.data());
+ Debug::print(Debug::Classes,0," New template instance class `%s'`%s'\n",name().data(),templSpec.data());
templateClass = new ClassDef(
fileName,startLine,name()+templSpec,ClassDef::Class);
templateClass->setTemplateMaster(this);