Imported Upstream version 1.9.2upstream/1.9.2

1 files changed, 19 insertions, 19 deletions

diff --git a/src/membergroup.h b/src/membergroup.h
index 5b0c621..7fbafaa 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- *
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2021 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby
@@ -22,8 +20,6 @@
 #include <map>
 #include <memory>
 
-#include <qlist.h>
-#include "sortdict.h"
 #include "types.h"
 #include "reflist.h"
 
@@ -38,32 +34,32 @@ class GroupDef;
 class OutputList;
 class Definition;
 class DefinitionMutable;
-class FTextStream;
 class RefItem;
+class TextStream;
 
 /** A class representing a group of members. */
 class MemberGroup
 {
   public:
     //MemberGroup();
-    MemberGroup(const Definition *container,int id,const char *header,
-                const char *docs,const char *docFile,int docLine);
+    MemberGroup(const Definition *container,int id,const QCString &header,
+                const QCString &docs,const QCString &docFile,int docLine,MemberListContainer con);
    ~MemberGroup();
     QCString header() const { return grpHeader; }
     int groupId() const { return grpId; }
-    void insertMember(MemberDef *md);
+    void insertMember(const MemberDef *md);
     void setAnchors();
-    void writePlainDeclarations(OutputList &ol,
+    void writePlainDeclarations(OutputList &ol,bool inGroup,
                const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,
-               const ClassDef *inheritedFrom,const char *inheritId) const;
+               const ClassDef *inheritedFrom,const QCString &inheritId) const;
     void writeDeclarations(OutputList &ol,
                const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,
                bool showInline=FALSE) const;
-    void writeDocumentation(OutputList &ol,const char *scopeName,
+    void writeDocumentation(OutputList &ol,const QCString &scopeName,
                const Definition *container,bool showEnumValues,bool showInline) const;
-    void writeDocumentationPage(OutputList &ol,const char *scopeName,
+    void writeDocumentationPage(OutputList &ol,const QCString &scopeName,
                const DefinitionMutable *container) const;
-    void writeTagFile(FTextStream &);
+    void writeTagFile(TextStream &);
     void addGroupedInheritedMembers(OutputList &ol,const ClassDef *cd,
                MemberListType lt,
                const ClassDef *inheritedFrom,const QCString &inheritId) const;
@@ -84,10 +80,9 @@ class MemberGroup
     const Definition *container() const;
 
     int countInheritableMembers(const ClassDef *inheritedFrom) const;
-    void setInGroup(bool b);
     void addListReferences(Definition *d);
     void setRefItems(const RefItemVector &sli);
-    MemberList *members() const { return memberList; }
+    const MemberList &members() const { return *memberList.get(); }
     QCString anchor() const;
 
     QCString docFile() const { return m_docFile; }
@@ -95,7 +90,7 @@ class MemberGroup
 
   private:
     const Definition *m_container;
-    MemberList *memberList = 0;      // list of all members in the group
+    std::unique_ptr<MemberList> memberList;      // list of all members in the group
     MemberList *inDeclSection = 0;
     int grpId = 0;
     QCString grpHeader;
@@ -107,8 +102,13 @@ class MemberGroup
     RefItemVector m_xrefListItems;
 };
 
-using MemberGroupRefList = std::vector<MemberGroup *>;
-using MemberGroupList = std::vector< std::unique_ptr<MemberGroup> >;
+class MemberGroupRefList : public std::vector<MemberGroup *>
+{
+};
+
+class MemberGroupList : public std::vector< std::unique_ptr<MemberGroup> >
+{
+};
 
 /** Data collected for a member group */
 struct MemberGroupInfo