1 files changed, 13 insertions, 3 deletions
diff --git a/src/classdef.h b/src/classdef.h
index 205b437..f73b08c 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -21,6 +21,7 @@
 #include "qtbc.h"
 #include <qlist.h>
 #include <qdict.h>
+#include <qptrdict.h>
 #include <qstrlist.h>
 
 #include "util.h"
@@ -330,7 +331,7 @@ class ClassDef : public Definition
     void writeDocumentationForInnerClasses(OutputList &ol);
     void writeMemberPages(OutputList &ol);
     void writeMemberList(OutputList &ol);
-    void writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup);
+    void writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup,const char *inheritId);
     void writeQuickMemberLinks(OutputList &ol,MemberDef *md) const;
     void writeSummaryLinks(OutputList &ol);
     void reclassifyMember(MemberDef *md,MemberDef::MemberType t);
@@ -338,6 +339,8 @@ class ClassDef : public Definition
     void writeDeclarationLink(OutputList &ol,bool &found,
                               const char *header,bool localNames);
     void removeMemberFromLists(MemberDef *md);
+    void addGroupedInheritedMembers(OutputList &ol,MemberList::ListType lt,
+                              const QCString &inheritId);
     
     bool visited;
 
@@ -354,11 +357,12 @@ class ClassDef : public Definition
     QCString getMemberListFileName() const;
     void addMemberToList(MemberList::ListType lt,MemberDef *md,bool isBrief);
     MemberList *createMemberList(MemberList::ListType lt);
+    void writeInheritedMemberDeclarations(OutputList &ol,MemberList::ListType lt,const QCString &title,ClassDef *inheritedFrom,bool invert,QPtrDict<void> *visitedClasses);
     void writeMemberDeclarations(OutputList &ol,MemberList::ListType lt,const QCString &title,
-                                 const char *subTitle=0,bool showInline=FALSE);
+                                 const char *subTitle=0,bool showInline=FALSE,ClassDef *inheritedFrom=0,int lt2=-1,QPtrDict<void> *visitedClasses=0);
     void writeMemberDocumentation(OutputList &ol,MemberList::ListType lt,const QCString &title,bool showInline=FALSE);
     void writeSimpleMemberDocumentation(OutputList &ol,MemberList::ListType lt);
-    void writePlainMemberDeclaration(OutputList &ol,MemberList::ListType lt,bool inGroup);
+    void writePlainMemberDeclaration(OutputList &ol,MemberList::ListType lt,bool inGroup,const char *inheritId);
     void writeBriefDescription(OutputList &ol,bool exampleFlag);
     void writeDetailedDescription(OutputList &ol,const QCString &pageType,bool exampleFlag,
                                   const QCString &title,const QCString &anchor=QCString());
@@ -377,6 +381,12 @@ class ClassDef : public Definition
     void writeMoreLink(OutputList &ol,const QCString &anchor);
     void writeDetailedDocumentationBody(OutputList &ol);
     
+    int countInheritedDecMembersRec(MemberList::ListType lt);
+    int countInheritedDecMembers(MemberList::ListType lt);
+    int countAdditionalInheritedMembers();
+    void writeAdditionalInheritedMembers(OutputList &ol);
+    int countMembersIncludingGrouped(MemberList::ListType lt);
+    
     ClassDefImpl *m_impl;
 
 };