diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-25 09:09:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-25 09:09:33 (GMT) |
commit | 80f1f380f199f470ef9678a413d537feba68d87a (patch) | |
tree | 57ad379d75b0ede4af42ec20e1d21fd04c9b5360 /src/membergroup.h | |
parent | 36c549da50d685fd8be82e88cb63db5cf13c57f5 (diff) | |
parent | ff3fdb3ac14a1f90334ca6c40eac46c772b5af63 (diff) | |
download | Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.zip Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.tar.gz Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.tar.bz2 |
Merge branch 'master' into feature/bug_style_change
Diffstat (limited to 'src/membergroup.h')
-rw-r--r-- | src/membergroup.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/membergroup.h b/src/membergroup.h index c332b56..aa30063 100644 --- a/src/membergroup.h +++ b/src/membergroup.h @@ -18,6 +18,8 @@ #ifndef MEMBERGROUP_H #define MEMBERGROUP_H +#include <vector> + #include <qlist.h> #include "sortdict.h" #include "types.h" @@ -32,7 +34,6 @@ class FileDef; class GroupDef; class OutputList; class Definition; -class StorageIntf; class FTextStream; struct ListItemInfo; @@ -80,7 +81,7 @@ class MemberGroup int countInheritableMembers(const ClassDef *inheritedFrom) const; void setInGroup(bool b); void addListReferences(Definition *d); - void setRefItems(const QList<ListItemInfo> *sli); + void setRefItems(const std::vector<ListItemInfo> &sli); MemberList *members() const { return memberList; } QCString anchor() const; @@ -88,19 +89,19 @@ class MemberGroup int docLine() const { return m_docLine; } private: - MemberList *memberList; // list of all members in the group - MemberList *inDeclSection; - int grpId; + MemberList *memberList = 0; // list of all members in the group + MemberList *inDeclSection = 0; + int grpId = 0; QCString grpHeader; QCString fileName; // base name of the generated file QCString doc; - bool inSameSection; - int m_numDecMembers; - int m_numDocMembers; - const Definition *m_parent; + bool inSameSection = 0; + int m_numDecMembers = 0; + int m_numDocMembers = 0; + const Definition *m_parent = 0; QCString m_docFile; - int m_docLine; - QList<ListItemInfo> *m_xrefListItems; + int m_docLine = 0; + std::vector<ListItemInfo> m_xrefListItems; }; /** A list of MemberGroup objects. */ @@ -132,15 +133,13 @@ class MemberGroupSDict : public SIntDict<MemberGroup> /** Data collected for a member group */ struct MemberGroupInfo { - MemberGroupInfo() : docLine(-1), m_sli(0) {} - ~MemberGroupInfo() { delete m_sli; m_sli=0; } - void setRefItems(const QList<ListItemInfo> *sli); + void setRefItems(const std::vector<ListItemInfo> &sli); QCString header; QCString doc; QCString docFile; - int docLine; + int docLine = -1; QCString compoundName; - QList<ListItemInfo> *m_sli; + std::vector<ListItemInfo> m_sli; }; #endif |