summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-12-09 10:22:45 (GMT)
committerGitHub <noreply@github.com>2018-12-09 10:22:45 (GMT)
commit6a2f18b954cb9daf5f48db52b75ac68339f687a3 (patch)
tree0e645d9a83a3d96956071175dcac120eaa884a4c
parent6418587b6408e11bd400bea6729ade840fa4204c (diff)
parent730b7827a8e6dd4ef82d91b6ac6c3d58f95313e3 (diff)
downloadDoxygen-6a2f18b954cb9daf5f48db52b75ac68339f687a3.zip
Doxygen-6a2f18b954cb9daf5f48db52b75ac68339f687a3.tar.gz
Doxygen-6a2f18b954cb9daf5f48db52b75ac68339f687a3.tar.bz2
Merge pull request #6650 from albert-github/feature/bug_774118
Bug 774118 - EXTERNAL_GROUPS lose hierarchy
-rw-r--r--src/tagreader.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 1afa30d..45543de 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -40,6 +40,7 @@
#include "filedef.h"
#include "filename.h"
#include "section.h"
+#include "groupdef.h"
/** Information about an linkable anchor */
class TagAnchorInfo
@@ -1469,6 +1470,22 @@ void TagFileParser::buildLists(Entry *root)
root->addSubEntry(ge);
}
+ // set subgroup relations bug_774118
+ for (git.toFirst();(tgi=git.current());++git)
+ {
+ QCStringList::Iterator it;
+ for ( it = tgi->subgroupList.begin(); it != tgi->subgroupList.end(); ++it )
+ {
+ QListIterator<Entry> eli(*(root->children()));
+ Entry *childNode;
+ for (eli.toFirst();(childNode=eli.current());++eli)
+ {
+ if (childNode->name == (*it)) break;
+ }
+ childNode->groups->append(new Grouping(tgi->name,Grouping::GROUPING_INGROUP));
+ }
+ }
+
// build page list
QListIterator<TagPageInfo> pgit(m_tagFilePages);
TagPageInfo *tpi;