summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-01-09 19:23:14 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-01-09 19:23:14 (GMT)
commit158ffb7f8921b120eafea0e356a5362ea6c71ba6 (patch)
treeb691cd67ccce3e85c14f3c12b80bdadca4d04f27 /src
parentb4b40f4c7ea57655d1264e8f72c754526e3a9209 (diff)
parent16a5d979a7d6f69d06c57d2299685975d051510c (diff)
downloadDoxygen-158ffb7f8921b120eafea0e356a5362ea6c71ba6.zip
Doxygen-158ffb7f8921b120eafea0e356a5362ea6c71ba6.tar.gz
Doxygen-158ffb7f8921b120eafea0e356a5362ea6c71ba6.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r--src/sqlite3gen.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index a59a3d0..d22d915 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -310,7 +310,8 @@ static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst, c
{
sscanf(floc,"%[^:]:%d:%d",file,&line,&column);
}
- insertMemberReference(db,src->anchor().data(),dst->anchor().data(),file,line,column);
+#warning Disabled until the xref key can be stored as file:line:column
+ //insertMemberReference(db,src->anchor().data(),dst->anchor().data(),file,line,column);
}
}
@@ -476,7 +477,6 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
// + template arguments
// (templateArguments(), definitionTemplateParameterLists())
// - call graph
- msg("=====%s\n",md->name().data());
// enum values are written as part of the enum
if (md->memberType()==MemberType_EnumValue) return;
@@ -611,11 +611,12 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
StringList l;
linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a->type);
- QCString *s=l.first();
- while (s)
+ StringListIterator li(l);
+ QCString *s;
+ while ((s=li.current()))
{
insertMemberReference(db,md->anchor().data(),s->data(),def->getDefFileName().data(),md->getDefLine(),1);
- s=l.next();
+ ++li;
}
}
if (!a->name.isEmpty())
@@ -669,8 +670,9 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
StringList l;
linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,md->initializer());
- QCString *s=l.first();
- while (s)
+ StringListIterator li(l);
+ QCString *s;
+ while ((s=li.current()))
{
if (md->getBodyDef())
{
@@ -681,7 +683,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
md->getStartBodyLine()));
insertMemberReference(db,md->anchor().data(),s->data(),md->getBodyDef()->getDefFileName().data(),md->getStartBodyLine(),1);
}
- s=l.next();
+ ++li;
}
}
@@ -762,7 +764,6 @@ static void generateSqlite3Section(sqlite3*db,
int count=0;
for (mli.toFirst();(md=mli.current());++mli)
{
- msg("I:%s\n",md->name().data());
// namespace members are also inserted in the file scope, but
// to prevent this duplication in the XML output, we filter those here.
if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0)