diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-22 17:48:17 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-22 17:48:17 (GMT) |
commit | d244b46490a6c5e1d9179c46683811ad56557809 (patch) | |
tree | 696d43a393d5a2785448e0dcb0566f57a000b70c /src/membergroup.cpp | |
parent | a6da9a48ad520206462632496fc4c83d72bffe5a (diff) | |
parent | 786f8c9d2b55ebcde9e2702fc9dfc8ab1e4609b6 (diff) | |
download | Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.zip Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.tar.gz Doxygen-d244b46490a6c5e1d9179c46683811ad56557809.tar.bz2 |
Merge branch 'master' into feature/bug_550158
Diffstat (limited to 'src/membergroup.cpp')
-rw-r--r-- | src/membergroup.cpp | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/src/membergroup.cpp b/src/membergroup.cpp index c127302..05c38c3 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -56,7 +56,6 @@ MemberGroup::MemberGroup(int id,const char *hdr,const char *d,const char *docFil m_numDocMembers = -1; m_docFile = docFile; m_docLine = docLine; - m_xrefListItems = 0; //printf("Member group docs='%s'\n",doc.data()); } @@ -340,7 +339,7 @@ QCString MemberGroup::anchor() const void MemberGroup::addListReferences(Definition *def) { memberList->addListReferences(def); - if (m_xrefListItems && def) + if (def) { QCString name = def->getOutputFileBase()+"#"+anchor(); addRefItem(m_xrefListItems, @@ -357,23 +356,9 @@ void MemberGroup::findSectionsInDocumentation(const Definition *d) memberList->findSectionsInDocumentation(d); } -void MemberGroup::setRefItems(const QList<ListItemInfo> *sli) +void MemberGroup::setRefItems(const std::vector<ListItemInfo> &sli) { - if (sli) - { - // deep copy the list - if (m_xrefListItems==0) - { - m_xrefListItems=new QList<ListItemInfo>; - m_xrefListItems->setAutoDelete(TRUE); - } - QListIterator<ListItemInfo> slii(*sli); - ListItemInfo *lii; - for (slii.toFirst();(lii=slii.current());++slii) - { - m_xrefListItems->append(new ListItemInfo(*lii)); - } - } + m_xrefListItems.insert(m_xrefListItems.end(), sli.cbegin(), sli.cend()); } void MemberGroup::writeTagFile(FTextStream &tagFile) @@ -383,18 +368,7 @@ void MemberGroup::writeTagFile(FTextStream &tagFile) //-------------------------------------------------------------------------- -void MemberGroupInfo::setRefItems(const QList<ListItemInfo> *sli) +void MemberGroupInfo::setRefItems(const std::vector<ListItemInfo> &sli) { - if (!sli) return; - if (m_sli==0) - { - m_sli = new QList<ListItemInfo>; - m_sli->setAutoDelete(TRUE); - } - QListIterator<ListItemInfo> slii(*sli); - ListItemInfo *ili; - for (slii.toFirst();(ili=slii.current());++slii) - { - m_sli->append(new ListItemInfo(*ili)); - } + m_sli.insert(m_sli.end(), sli.cbegin(), sli.cend()); } |