diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 01:32:36 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 01:32:36 -0700 |
| commit | 0fa219774dcf9141ae91204f948c029b05673f3f (patch) | |
| tree | 32a12974c9bd34edb895b8d33df47bf9db959001 /docs/doxygen | |
| parent | b1f802015fe5ce88c45f68f09d81fce0cdb75411 (diff) | |
| parent | 318da62b6104e4bca182d94aec4abc0618debffd (diff) | |
Merge with next branch.
Diffstat (limited to 'docs/doxygen')
| -rw-r--r-- | docs/doxygen/doxyxml/doxyindex.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py index 8c5502a61f..69c6de07f5 100644 --- a/docs/doxygen/doxyxml/doxyindex.py +++ b/docs/doxygen/doxyxml/doxyindex.py @@ -43,13 +43,16 @@ class DoxyIndex(Base): self._root = index.parse(os.path.join(self._xml_path, 'index.xml')) for mem in self._root.compound: converted = self.convert_mem(mem) - # For files we want the contents to be accessible directly - # from the parent rather than having to go through the file - # object. + # For files and namespaces we want the contents to be + # accessible directly from the parent rather than having + # to go through the file object. if self.get_cls(mem) == DoxyFile: if mem.name.endswith('.h'): self._members += converted.members() self._members.append(converted) + elif self.get_cls(mem) == DoxyNamespace: + self._members += converted.members() + self._members.append(converted) else: self._members.append(converted) @@ -227,7 +230,17 @@ class DoxyNamespace(DoxyCompound): __module__ = "gnuradio.utils.doxyxml" kind = 'namespace' - + + def _parse(self): + if self._parsed: + return + super(DoxyNamespace, self)._parse() + self.retrieve_data() + self.set_descriptions(self._retrieved_data.compounddef) + if self._error: + return + self.process_memberdefs() + Base.mem_classes.append(DoxyNamespace) |