summaryrefslogtreecommitdiffstats
path: root/src/sqlite3gen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-23 12:07:03 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-12-23 12:07:03 (GMT)
commitbf5c2ac20e42f440ae0199d4d809b9d5e7e22191 (patch)
treeb4d2a77dfec1d6dcc57543d065ac5ce8ce648824 /src/sqlite3gen.cpp
parent9bf7658013e49dabaafb818a639b5ca62f845538 (diff)
downloadDoxygen-bf5c2ac20e42f440ae0199d4d809b9d5e7e22191.zip
Doxygen-bf5c2ac20e42f440ae0199d4d809b9d5e7e22191.tar.gz
Doxygen-bf5c2ac20e42f440ae0199d4d809b9d5e7e22191.tar.bz2
Refactoring: replaced getNamespaceSDict() by getNamespaces()
Diffstat (limited to 'src/sqlite3gen.cpp')
-rw-r--r--src/sqlite3gen.cpp26
1 files changed, 9 insertions, 17 deletions
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index f06d6ee..e272ed0 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -1344,22 +1344,17 @@ static void writeInnerDirs(const DirList &dl, struct Refid outer_refid)
}
}
-static void writeInnerNamespaces(const NamespaceSDict *nl, struct Refid outer_refid)
+static void writeInnerNamespaces(const NamespaceLinkedRefMap &nl, struct Refid outer_refid)
{
- if (nl)
+ for (const auto &nd : nl)
{
- NamespaceSDict::Iterator nli(*nl);
- const NamespaceDef *nd;
- for (nli.toFirst();(nd=nli.current());++nli)
+ if (!nd->isHidden() && !nd->isAnonymous())
{
- if (!nd->isHidden() && !nd->isAnonymous())
- {
- struct Refid inner_refid = insertRefid(nd->getOutputFileBase());
+ struct Refid inner_refid = insertRefid(nd->getOutputFileBase());
- bindIntParameter(contains_insert,":inner_rowid",inner_refid.rowid);
- bindIntParameter(contains_insert,":outer_rowid",outer_refid.rowid);
- step(contains_insert);
- }
+ bindIntParameter(contains_insert,":inner_rowid",inner_refid.rowid);
+ bindIntParameter(contains_insert,":outer_rowid",outer_refid.rowid);
+ step(contains_insert);
}
}
}
@@ -2081,7 +2076,7 @@ static void generateSqlite3ForNamespace(const NamespaceDef *nd)
writeInnerClasses(nd->getClasses(),refid);
// + contained namespace definitions
- writeInnerNamespaces(nd->getNamespaceSDict(),refid);
+ writeInnerNamespaces(nd->getNamespaces(),refid);
// + member groups
if (nd->getMemberGroupSDict())
@@ -2243,10 +2238,7 @@ static void generateSqlite3ForFile(const FileDef *fd)
writeInnerClasses(fd->getClasses(),refid);
// + contained namespace definitions
- if (fd->getNamespaceSDict())
- {
- writeInnerNamespaces(fd->getNamespaceSDict(),refid);
- }
+ writeInnerNamespaces(fd->getNamespaces(),refid);
// + member groups
if (fd->getMemberGroupSDict())