summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-19 19:35:25 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-12-19 19:35:25 (GMT)
commitab0bab6c7435c2adc8d7b3fdcc02ce8ee3fab312 (patch)
treeddd02ff02bad17d8307cf982f6babb6342d71c78 /addon
parent77a37d141d3603c0089bc4a231c9381c1bb7d707 (diff)
parent963caeef1c24d66a51376f77d8692f1a3c5d4a62 (diff)
downloadDoxygen-ab0bab6c7435c2adc8d7b3fdcc02ce8ee3fab312.zip
Doxygen-ab0bab6c7435c2adc8d7b3fdcc02ce8ee3fab312.tar.gz
Doxygen-ab0bab6c7435c2adc8d7b3fdcc02ce8ee3fab312.tar.bz2
Merge branch 'ClassSDict'
Diffstat (limited to 'addon')
-rw-r--r--addon/doxyapp/doxyapp.cpp4
-rw-r--r--addon/doxyparse/doxyparse.cpp15
2 files changed, 7 insertions, 12 deletions
diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index 3ec8fb2..2a788b2 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -185,8 +185,8 @@ static void lookupSymbol(Definition *d)
case Definition::TypeNamespace:
{
NamespaceDef *nd = dynamic_cast<NamespaceDef*>(d);
- printf("Kind: Namespace: contains %d classes and %d namespaces\n",
- nd->getClassSDict() ? nd->getClassSDict()->count() : 0,
+ printf("Kind: Namespace: contains %zu classes and %d namespaces\n",
+ nd->getClasses().size(),
nd->getNamespaceSDict() ? nd->getNamespaceSDict()->count() : 0);
}
break;
diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp
index 4235bf3..b5fbcb3 100644
--- a/addon/doxyparse/doxyparse.cpp
+++ b/addon/doxyparse/doxyparse.cpp
@@ -413,16 +413,11 @@ static void listSymbols() {
listMembers(ml);
}
- ClassSDict *classes = fd->getClassSDict();
- if (classes) {
- ClassDefSet visitedClasses;
- ClassSDict::Iterator cli(*classes);
- const ClassDef *cd;
- for (cli.toFirst(); (cd = cli.current()); ++cli) {
- if (visitedClasses.find(cd)==visitedClasses.end()) {
- classInformation(cd);
- visitedClasses.insert(cd);
- }
+ ClassDefSet visitedClasses;
+ for (const auto &cd : fd->getClasses()) {
+ if (visitedClasses.find(cd)==visitedClasses.end()) {
+ classInformation(cd);
+ visitedClasses.insert(cd);
}
}
}