Release-1.2.14

3 files changed, 26 insertions, 2 deletions

diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index 344e457..12a3a24 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -805,6 +805,11 @@ void VariableListHandler::startListItem(const QXmlAttributes& attrib)
   m_curEntry->startListItem(attrib);
 }
 
+IDocIterator *VariableListHandler::entries() const
+{
+  return new VariableListIterator(*this);
+}
+
 //----------------------------------------------------------------------
 // HighlightHandler
 //----------------------------------------------------------------------
diff --git a/addon/doxmlparser/src/dochandler.h b/addon/doxmlparser/src/dochandler.h
index 3aaef72..0161576 100644
--- a/addon/doxmlparser/src/dochandler.h
+++ b/addon/doxmlparser/src/dochandler.h
@@ -533,7 +533,8 @@ class SimpleSectHandler : public IDocSimpleSect,
 /* \brief Node representing an named item of a VariableList.
  *
  */
-class VariableListEntryHandler : public IDocVariableListEntry, public BaseHandler<VariableListEntryHandler>
+class VariableListEntryHandler : public IDocVariableListEntry, 
+                                 public BaseHandler<VariableListEntryHandler>
 {
   public:
     virtual void startVarListEntry(const QXmlAttributes& attrib);
@@ -549,6 +550,8 @@ class VariableListEntryHandler : public IDocVariableListEntry, public BaseHandle
 
     // IDocVariableListEntry
     virtual Kind kind() const { return VariableListEntry; }
+    virtual QString term() const { return m_term; }
+    virtual IDocPara *description() const { return m_description; }
 
   private:
     IBaseHandler     *m_parent;
@@ -562,8 +565,11 @@ class VariableListEntryHandler : public IDocVariableListEntry, public BaseHandle
  *
  */
 // children: varlistentry, listitem
-class VariableListHandler : public IDocVariableList, public BaseHandler<VariableListHandler>
+class VariableListHandler : public IDocVariableList, 
+                            public BaseHandler<VariableListHandler>
 {
+    friend class VariableListIterator;
+    
   public:
     virtual void startVariableList(const QXmlAttributes& attrib);
     virtual void endVariableList();
@@ -575,6 +581,7 @@ class VariableListHandler : public IDocVariableList, public BaseHandler<Variable
 
     // IDocVariableList
     virtual Kind kind() const { return VariableList; }
+    virtual IDocIterator *entries() const;
 
   private:
     IBaseHandler   *m_parent;
@@ -582,6 +589,13 @@ class VariableListHandler : public IDocVariableList, public BaseHandler<Variable
     VariableListEntryHandler *m_curEntry;
 };
 
+class VariableListIterator : public BaseIterator<IDocIterator,IDoc,VariableListEntryHandler>
+{
+  public:
+    VariableListIterator(const VariableListHandler &handler) : 
+      BaseIterator<IDocIterator,IDoc,VariableListEntryHandler>(handler.m_entries) {}
+};
+
 //-----------------------------------------------------------------------------
 
 /*! \brief Node representing a highlighted text fragment.
diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h
index 0ca2cc8..03a8b3a 100644
--- a/addon/doxmlparser/src/doxmlintf.h
+++ b/addon/doxmlparser/src/doxmlintf.h
@@ -249,10 +249,15 @@ class IDocRef : public IDoc
 
 class IDocVariableList : public IDoc
 {
+  public:
+    virtual IDocIterator *entries() const = 0;
 };
 
 class IDocVariableListEntry : public IDoc
 {
+  public:
+    virtual QString term() const = 0;
+    virtual IDocPara *description() const = 0;
 };
 
 class IDocHRuler : public IDoc