diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2002-05-26 18:59:19 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2002-05-26 18:59:19 (GMT) |
| commit | 66db5d8497c9a97b4cd09fb5c12f7914cc3e9d91 (patch) | |
| tree | 8da3c1cc21a0d88ac39dc5fca731aae2aefa1ce2 /addon/doxmlparser | |
| parent | 5a7cb5383abbd105c22dca28171806bd2a5a9cda (diff) | |
| download | Doxygen-66db5d8497c9a97b4cd09fb5c12f7914cc3e9d91.zip Doxygen-66db5d8497c9a97b4cd09fb5c12f7914cc3e9d91.tar.gz Doxygen-66db5d8497c9a97b4cd09fb5c12f7914cc3e9d91.tar.bz2 | |
Release-1.2.16-20020526
Diffstat (limited to 'addon/doxmlparser')
| -rw-r--r-- | addon/doxmlparser/src/mainhandler.cpp | 18 | ||||
| -rw-r--r-- | addon/doxmlparser/src/mainhandler.h | 1 |
2 files changed, 14 insertions, 5 deletions
diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp index 7a67c02..d4e296f 100644 --- a/addon/doxmlparser/src/mainhandler.cpp +++ b/addon/doxmlparser/src/mainhandler.cpp @@ -100,6 +100,7 @@ MainHandler::MainHandler() : m_compoundDict(2999), m_compoundNameDict(2999), addStartHandler("name",this,&MainHandler::startName); addEndHandler("name",this,&MainHandler::endName); m_curCompound = 0; + m_insideMember = FALSE; } MainHandler::~MainHandler() @@ -110,7 +111,7 @@ MainHandler::~MainHandler() void MainHandler::startCompound(const QXmlAttributes& attrib) { m_curCompound = new CompoundEntry(257); - m_curCompound->id = attrib.value("id"); + m_curCompound->id = attrib.value("refid"); m_compounds.append(m_curCompound); m_compoundDict.insert(m_curCompound->id,m_curCompound); } @@ -122,21 +123,27 @@ void MainHandler::startName(const QXmlAttributes& /*attrib*/) void MainHandler::endName() { - m_curCompound->name = m_curString; + if (m_insideMember) + { + m_curMember->name = m_curString; + } + else + { + m_curCompound->name = m_curString; + } } void MainHandler::startMember(const QXmlAttributes& attrib) { - m_curString = ""; + m_insideMember = TRUE; m_curMember = new MemberEntry; - m_curMember->id = attrib.value("id"); + m_curMember->id = attrib.value("refid"); m_curMember->compound = m_curCompound; m_memberDict.insert(m_curMember->id,m_curMember); } void MainHandler::endMember() { - m_curMember->name = m_curString; m_curCompound->memberDict.insert(m_curString,m_curMember); QList<CompoundEntry> *cel=0; if ((cel=m_memberNameDict.find(m_curString))==0) @@ -145,6 +152,7 @@ void MainHandler::endMember() m_memberNameDict.insert(m_curString,cel); } cel->append(m_curCompound); + m_insideMember = FALSE; } void MainHandler::setDebugLevel(int level) diff --git a/addon/doxmlparser/src/mainhandler.h b/addon/doxmlparser/src/mainhandler.h index a0cef10..8385b57 100644 --- a/addon/doxmlparser/src/mainhandler.h +++ b/addon/doxmlparser/src/mainhandler.h @@ -76,6 +76,7 @@ class MainHandler : public IDoxygen, public BaseHandler<MainHandler> QDict<QList<CompoundEntry> > m_memberNameDict; QString m_xmlDirName; QDict<CompoundHandler> m_compoundsLoaded; + bool m_insideMember; }; #endif |