summaryrefslogtreecommitdiffstats
path: root/src/docsets.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-02-08 20:59:33 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-02-08 20:59:33 (GMT)
commitf22ba481afa686d1a834e056963f8d41621aba88 (patch)
tree267387c59c5c0c6c4623d616f7102d54600dfba9 /src/docsets.cpp
parent3eb607c72338237e65fc44562b153db7ce4e0ac9 (diff)
downloadDoxygen-f22ba481afa686d1a834e056963f8d41621aba88.zip
Doxygen-f22ba481afa686d1a834e056963f8d41621aba88.tar.gz
Doxygen-f22ba481afa686d1a834e056963f8d41621aba88.tar.bz2
Release-1.6.2-20100208
Diffstat (limited to 'src/docsets.cpp')
-rw-r--r--src/docsets.cpp103
1 files changed, 51 insertions, 52 deletions
diff --git a/src/docsets.cpp b/src/docsets.cpp
index fce61e5..449ac1f 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -283,67 +283,66 @@ void DocSets::addIndexItem(Definition *context,MemberDef *md,
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="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="instm"; // instance member
+ }
+ else if (cd && cd->compoundType()==ClassDef::Protocol)
+ {
+ if (md->isStatic())
+ type="intfcm"; // interface class member
+ else
+ 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())
{