diff -r d8fccb2cd802 -r 468f4c8d3d5b Orb/Doxygen/src/docsets.cpp --- a/Orb/Doxygen/src/docsets.cpp Fri Apr 23 20:47:58 2010 +0100 +++ b/Orb/Doxygen/src/docsets.cpp Wed Aug 11 14:49:30 2010 +0100 @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2008 by Dimitri van Heesch. + * Copyright (C) 1997-2010 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -283,67 +283,66 @@ if (md) { - if (!md->isLinkable()) return; // internal symbol if (context==0) { if (md->getGroupDef()) context = md->getGroupDef(); else if (md->getFileDef()) context = md->getFileDef(); - if (context==0) return; // should not happen + } + if (context==0) return; // should not happen - switch (md->memberType()) - { - case MemberDef::Define: - type="macro"; break; - case MemberDef::Function: - if (cd && (cd->compoundType()==ClassDef::Interface || - cd->compoundType()==ClassDef::Class)) - { - if (md->isStatic()) - type="clm"; // class member - else - type="instm"; // instance member - } - else if (cd && cd->compoundType()==ClassDef::Protocol) - { - if (md->isStatic()) - type="intfcm"; // interface class member - else - type="intfm"; // interface member - } + switch (md->memberType()) + { + case MemberDef::Define: + type="macro"; break; + case MemberDef::Function: + if (cd && (cd->compoundType()==ClassDef::Interface || + cd->compoundType()==ClassDef::Class)) + { + if (md->isStatic()) + type="clm"; // class member + else + type="instm"; // instance member + } + else if (cd && cd->compoundType()==ClassDef::Protocol) + { + if (md->isStatic()) + type="intfcm"; // interface class member else - type="func"; - break; - case MemberDef::Variable: - type="data"; break; - case MemberDef::Typedef: - type="tdef"; break; - case MemberDef::Enumeration: - type="enum"; break; - case MemberDef::EnumValue: - type="econst"; break; - //case MemberDef::Prototype: - // type="prototype"; break; - case MemberDef::Signal: - type="signal"; break; - case MemberDef::Slot: - type="slot"; break; - case MemberDef::Friend: - type="ffunc"; break; - case MemberDef::DCOP: - type="dcop"; break; - case MemberDef::Property: - if (cd && cd->compoundType()==ClassDef::Protocol) - type="intfp"; // interface property - else - type="instp"; // instance property - break; - case MemberDef::Event: - type="event"; break; - } - writeToken(m_tts,md,type,lang,scope,md->anchor()); + type="intfm"; // interface member + } + else + type="func"; + break; + case MemberDef::Variable: + type="data"; break; + case MemberDef::Typedef: + type="tdef"; break; + case MemberDef::Enumeration: + type="enum"; break; + case MemberDef::EnumValue: + type="econst"; break; + //case MemberDef::Prototype: + // type="prototype"; break; + case MemberDef::Signal: + type="signal"; break; + case MemberDef::Slot: + type="slot"; break; + case MemberDef::Friend: + type="ffunc"; break; + case MemberDef::DCOP: + type="dcop"; break; + case MemberDef::Property: + if (cd && cd->compoundType()==ClassDef::Protocol) + type="intfp"; // interface property + else + type="instp"; // instance property + break; + case MemberDef::Event: + type="event"; break; } + writeToken(m_tts,md,type,lang,scope,md->anchor()); } else if (context && context->isLinkable()) {