Skip to content

Commit

Permalink
issue_6594 using ingroup and anchor causes tests to disappear
Browse files Browse the repository at this point in the history
The determination whether or not a reference item was in a list was based on the list name and it returned the first list item id. With multiple items only the first item was found.
Checking whether an item should be appended is now based on the list name and the item id.
  • Loading branch information
albert-github committed Nov 3, 2018
1 parent 1b88f24 commit ebbb2ca
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/definition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1644,13 +1644,21 @@ void Definition::mergeRefItems(Definition *d)
m_impl->xrefListItems->setAutoDelete(TRUE);
}
QListIterator<ListItemInfo> slii(*xrefList);
QListIterator<ListItemInfo> mlii(*m_impl->xrefListItems);
ListItemInfo *lii;
ListItemInfo *mii;
for (slii.toFirst();(lii=slii.current());++slii)
{
if (_getXRefListId(lii->type)==-1)
bool found = false;
for (mlii.toFirst();(mii=mlii.current());++mlii)
{
m_impl->xrefListItems->append(new ListItemInfo(*lii));
if ((qstrcmp(lii->type,mii->type)==0) && (lii->itemId == mii->itemId))
{
found = true;
break;
}
}
if (!found) m_impl->xrefListItems->append(new ListItemInfo(*lii));
}
}
}
Expand Down

0 comments on commit ebbb2ca

Please sign in to comment.