Merge branch 'ClassSDict'

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);
         }
       }
     }