From 079ddb370a11d955e9df5a325641e3044f0f7e31 Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 23 Nov 2023 17:36:54 +0100 Subject: [PATCH 1/2] Give functions override attribute Give virtual functions override attribute to prevent sonarcloud warnings. --- src/classdef.cpp | 496 +++++++++++----------- src/conceptdef.cpp | 98 ++--- src/definitionimpl.h | 300 +++++++------- src/dirdef.cpp | 68 +-- src/filedef.cpp | 160 ++++---- src/groupdef.cpp | 130 +++--- src/memberdef.cpp | 956 +++++++++++++++++++++---------------------- src/moduledef.cpp | 50 +-- src/namespacedef.cpp | 182 ++++---- src/pagedef.cpp | 62 +-- 10 files changed, 1251 insertions(+), 1251 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index e75867db2aa..32b04d99cca 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -192,166 +192,166 @@ class ClassDefImpl : public DefinitionMixin bool isSymbol=TRUE,bool isJavaEnum=FALSE); ClassDef *resolveAlias() { return this; } - virtual DefType definitionType() const override { return TypeClass; } - virtual CodeSymbolType codeSymbolType() const override; - virtual QCString getOutputFileBase() const override; - virtual QCString getInstanceOutputFileBase() const override; - virtual QCString getSourceFileBase() const override; - virtual QCString getReference() const override; - virtual bool isReference() const override; - virtual bool isLocal() const override; - virtual ClassLinkedRefMap getClasses() const override; - virtual bool hasDocumentation() const override; - virtual bool hasDetailedDescription() const override; - virtual QCString collaborationGraphFileName() const override; - virtual QCString inheritanceGraphFileName() const override; - virtual QCString displayName(bool includeScope=TRUE) const override; - virtual CompoundType compoundType() const override; - virtual QCString compoundTypeString() const override; - virtual const BaseClassList &baseClasses() const override; - virtual void updateBaseClasses(const BaseClassList &bcd) override; - virtual const BaseClassList &subClasses() const override; - virtual void updateSubClasses(const BaseClassList &bcd) override; - virtual const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const override; - virtual Protection protection() const override; - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual bool isVisibleInHierarchy() const override; - virtual bool visibleInParentsDeclList() const override; - virtual const ArgumentList &templateArguments() const override; - virtual FileDef *getFileDef() const override; - virtual ModuleDef *getModuleDef() const override; - virtual const MemberDef *getMemberByName(const QCString &) const override; - virtual int isBaseClass(const ClassDef *bcd,bool followInstances,const QCString &templSpec) const override; - virtual bool isSubClass(ClassDef *bcd,int level=0) const override; - virtual bool isAccessibleMember(const MemberDef *md) const override; - virtual const TemplateInstanceList &getTemplateInstances() const override; - virtual const ClassDef *templateMaster() const override; - virtual bool isTemplate() const override; - virtual const IncludeInfo *includeInfo() const override; - virtual const UsesClassList &usedImplementationClasses() const override; - virtual const UsesClassList &usedByImplementationClasses() const override; - virtual const ConstraintClassList &templateTypeConstraints() const override; - virtual bool isTemplateArgument() const override; - virtual const Definition *findInnerCompound(const QCString &name) const override; - virtual ArgumentLists getTemplateParameterLists() const override; - virtual QCString qualifiedNameWithTemplateParameters( + DefType definitionType() const override { return TypeClass; } + CodeSymbolType codeSymbolType() const override; + QCString getOutputFileBase() const override; + QCString getInstanceOutputFileBase() const override; + QCString getSourceFileBase() const override; + QCString getReference() const override; + bool isReference() const override; + bool isLocal() const override; + ClassLinkedRefMap getClasses() const override; + bool hasDocumentation() const override; + bool hasDetailedDescription() const override; + QCString collaborationGraphFileName() const override; + QCString inheritanceGraphFileName() const override; + QCString displayName(bool includeScope=TRUE) const override; + CompoundType compoundType() const override; + QCString compoundTypeString() const override; + const BaseClassList &baseClasses() const override; + void updateBaseClasses(const BaseClassList &bcd) override; + const BaseClassList &subClasses() const override; + void updateSubClasses(const BaseClassList &bcd) override; + const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const override; + Protection protection() const override; + bool isLinkableInProject() const override; + bool isLinkable() const override; + bool isVisibleInHierarchy() const override; + bool visibleInParentsDeclList() const override; + const ArgumentList &templateArguments() const override; + FileDef *getFileDef() const override; + ModuleDef *getModuleDef() const override; + const MemberDef *getMemberByName(const QCString &) const override; + int isBaseClass(const ClassDef *bcd,bool followInstances,const QCString &templSpec) const override; + bool isSubClass(ClassDef *bcd,int level=0) const override; + bool isAccessibleMember(const MemberDef *md) const override; + const TemplateInstanceList &getTemplateInstances() const override; + const ClassDef *templateMaster() const override; + bool isTemplate() const override; + const IncludeInfo *includeInfo() const override; + const UsesClassList &usedImplementationClasses() const override; + const UsesClassList &usedByImplementationClasses() const override; + const ConstraintClassList &templateTypeConstraints() const override; + bool isTemplateArgument() const override; + const Definition *findInnerCompound(const QCString &name) const override; + ArgumentLists getTemplateParameterLists() const override; + QCString qualifiedNameWithTemplateParameters( const ArgumentLists *actualParams=0,uint32_t *actualParamIndex=0) const override; - virtual bool isAbstract() const override; - virtual bool isObjectiveC() const override; - virtual bool isFortran() const override; - virtual bool isCSharp() const override; - virtual bool isFinal() const override; - virtual bool isSealed() const override; - virtual bool isPublished() const override; - virtual bool isExtension() const override; - virtual bool isForwardDeclared() const override; - virtual bool isInterface() const override; - virtual ClassDef *categoryOf() const override; - virtual QCString className() const override; - virtual MemberList *getMemberList(MemberListType lt) const override; - virtual const MemberLists &getMemberLists() const override; - virtual const MemberGroupList &getMemberGroups() const override; - virtual const TemplateNameMap &getTemplateBaseClassNames() const override; - virtual bool isUsedOnly() const override; - virtual QCString anchor() const override; - virtual bool isEmbeddedInOuterScope() const override; - virtual bool isSimple() const override; - virtual const ClassDef *tagLessReference() const override; - virtual const MemberDef *isSmartPointer() const override; - virtual bool isJavaEnum() const override; - virtual QCString title() const override; - virtual QCString generatedFromFiles() const override; - virtual const FileList &usedFiles() const override; - virtual const ArgumentList &typeConstraints() const override; - virtual const ExampleList &getExamples() const override; - virtual bool hasExamples() const override; - virtual QCString getMemberListFileName() const override; - virtual bool subGrouping() const override; - virtual bool isSliceLocal() const override; - virtual bool hasNonReferenceSuperClass() const override; - virtual QCString requiresClause() const override; - virtual StringVector getQualifiers() const override; - virtual ClassDef *insertTemplateInstance(const QCString &fileName,int startLine,int startColumn, + bool isAbstract() const override; + bool isObjectiveC() const override; + bool isFortran() const override; + bool isCSharp() const override; + bool isFinal() const override; + bool isSealed() const override; + bool isPublished() const override; + bool isExtension() const override; + bool isForwardDeclared() const override; + bool isInterface() const override; + ClassDef *categoryOf() const override; + QCString className() const override; + MemberList *getMemberList(MemberListType lt) const override; + const MemberLists &getMemberLists() const override; + const MemberGroupList &getMemberGroups() const override; + const TemplateNameMap &getTemplateBaseClassNames() const override; + bool isUsedOnly() const override; + QCString anchor() const override; + bool isEmbeddedInOuterScope() const override; + bool isSimple() const override; + const ClassDef *tagLessReference() const override; + const MemberDef *isSmartPointer() const override; + bool isJavaEnum() const override; + QCString title() const override; + QCString generatedFromFiles() const override; + const FileList &usedFiles() const override; + const ArgumentList &typeConstraints() const override; + const ExampleList &getExamples() const override; + bool hasExamples() const override; + QCString getMemberListFileName() const override; + bool subGrouping() const override; + bool isSliceLocal() const override; + bool hasNonReferenceSuperClass() const override; + QCString requiresClause() const override; + StringVector getQualifiers() const override; + ClassDef *insertTemplateInstance(const QCString &fileName,int startLine,int startColumn, const QCString &templSpec,bool &freshInstance) const override; - virtual void insertBaseClass(ClassDef *,const QCString &name,Protection p,Specifier s,const QCString &t=QCString()) override; - virtual void insertSubClass(ClassDef *,Protection p,Specifier s,const QCString &t=QCString()) override; - virtual void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override; - virtual void insertMember(MemberDef *) override; - virtual void insertUsedFile(const FileDef *) override; - virtual bool addExample(const QCString &anchor,const QCString &name, const QCString &file) override; - virtual void mergeCategory(ClassDef *category) override; - virtual void setFileDef(FileDef *fd) override; - virtual void setModuleDef(ModuleDef *mod) override; - virtual void setSubGrouping(bool enabled) override; - virtual void setProtection(Protection p) override; - virtual void setGroupDefForAllMembers(GroupDef *g,Grouping::GroupPri_t pri,const QCString &fileName,int startLine,bool hasDocs) override; - virtual void addInnerCompound(Definition *d) override; - virtual void addUsedClass(ClassDef *cd,const QCString &accessName,Protection prot) override; - virtual void addUsedByClass(ClassDef *cd,const QCString &accessName,Protection prot) override; - virtual void setIsStatic(bool b) override; - virtual void setCompoundType(CompoundType t) override; - virtual void setClassName(const QCString &name) override; - virtual void setClassSpecifier(TypeSpecifier spec) override; - virtual void addQualifiers(const StringVector &qualifiers) override; - virtual void setTemplateArguments(const ArgumentList &al) override; - virtual void setTemplateBaseClassNames(const TemplateNameMap &templateNames) override; - virtual void setTemplateMaster(const ClassDef *tm) override; - virtual void setTypeConstraints(const ArgumentList &al) override; - virtual void addMembersToTemplateInstance(const ClassDef *cd,const ArgumentList &templateArguments,const QCString &templSpec) override; - virtual void makeTemplateArgument(bool b=TRUE) override; - virtual void setCategoryOf(ClassDef *cd) override; - virtual void setUsedOnly(bool b) override; - virtual void setTagLessReference(const ClassDef *cd) override; - virtual void setMetaData(const QCString &md) override; - virtual void findSectionsInDocumentation() override; - virtual void addMembersToMemberGroup() override; - virtual void addListReferences() override; - virtual void addTypeConstraints() override; - virtual void computeAnchors() override; - virtual void mergeMembers() override; - virtual void sortMemberLists() override; - virtual void distributeMemberGroupDocumentation() override; - virtual void writeDocumentation(OutputList &ol) const override; - virtual void writeDocumentationForInnerClasses(OutputList &ol) const override; - virtual void writeMemberPages(OutputList &ol) const override; - virtual void writeMemberList(OutputList &ol) const override; - virtual void writeDeclaration(OutputList &ol,const MemberDef *md,bool inGroup,int indentLevel, + void insertBaseClass(ClassDef *,const QCString &name,Protection p,Specifier s,const QCString &t=QCString()) override; + void insertSubClass(ClassDef *,Protection p,Specifier s,const QCString &t=QCString()) override; + void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override; + void insertMember(MemberDef *) override; + void insertUsedFile(const FileDef *) override; + bool addExample(const QCString &anchor,const QCString &name, const QCString &file) override; + void mergeCategory(ClassDef *category) override; + void setFileDef(FileDef *fd) override; + void setModuleDef(ModuleDef *mod) override; + void setSubGrouping(bool enabled) override; + void setProtection(Protection p) override; + void setGroupDefForAllMembers(GroupDef *g,Grouping::GroupPri_t pri,const QCString &fileName,int startLine,bool hasDocs) override; + void addInnerCompound(Definition *d) override; + void addUsedClass(ClassDef *cd,const QCString &accessName,Protection prot) override; + void addUsedByClass(ClassDef *cd,const QCString &accessName,Protection prot) override; + void setIsStatic(bool b) override; + void setCompoundType(CompoundType t) override; + void setClassName(const QCString &name) override; + void setClassSpecifier(TypeSpecifier spec) override; + void addQualifiers(const StringVector &qualifiers) override; + void setTemplateArguments(const ArgumentList &al) override; + void setTemplateBaseClassNames(const TemplateNameMap &templateNames) override; + void setTemplateMaster(const ClassDef *tm) override; + void setTypeConstraints(const ArgumentList &al) override; + void addMembersToTemplateInstance(const ClassDef *cd,const ArgumentList &templateArguments,const QCString &templSpec) override; + void makeTemplateArgument(bool b=TRUE) override; + void setCategoryOf(ClassDef *cd) override; + void setUsedOnly(bool b) override; + void setTagLessReference(const ClassDef *cd) override; + void setMetaData(const QCString &md) override; + void findSectionsInDocumentation() override; + void addMembersToMemberGroup() override; + void addListReferences() override; + void addTypeConstraints() override; + void computeAnchors() override; + void mergeMembers() override; + void sortMemberLists() override; + void distributeMemberGroupDocumentation() override; + void writeDocumentation(OutputList &ol) const override; + void writeDocumentationForInnerClasses(OutputList &ol) const override; + void writeMemberPages(OutputList &ol) const override; + void writeMemberList(OutputList &ol) const override; + void writeDeclaration(OutputList &ol,const MemberDef *md,bool inGroup,int indentLevel, const ClassDef *inheritedFrom,const QCString &inheritId) const override; - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override; - virtual void writeSummaryLinks(OutputList &ol) const override; - virtual void reclassifyMember(MemberDefMutable *md,MemberType t) override; - virtual void writeInlineDocumentation(OutputList &ol) const override; - virtual void writeDeclarationLink(OutputList &ol,bool &found, + void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override; + void writeSummaryLinks(OutputList &ol) const override; + void reclassifyMember(MemberDefMutable *md,MemberType t) override; + void writeInlineDocumentation(OutputList &ol) const override; + void writeDeclarationLink(OutputList &ol,bool &found, const QCString &header,bool localNames) const override; - virtual void removeMemberFromLists(MemberDef *md) override; - virtual void setAnonymousEnumType() override; - virtual void countMembers() override; - virtual void sortAllMembersList() override; + void removeMemberFromLists(MemberDef *md) override; + void setAnonymousEnumType() override; + void countMembers() override; + void sortAllMembersList() override; - virtual void addGroupedInheritedMembers(OutputList &ol,MemberListType lt, + void addGroupedInheritedMembers(OutputList &ol,MemberListType lt, const ClassDef *inheritedFrom,const QCString &inheritId) const override; - virtual void writeTagFile(TextStream &) const override; + void writeTagFile(TextStream &) const override; - virtual int countMembersIncludingGrouped(MemberListType lt,const ClassDef *inheritedFrom,bool additional) const override; - virtual int countInheritanceNodes() const override; - virtual int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, + int countMembersIncludingGrouped(MemberListType lt,const ClassDef *inheritedFrom,bool additional) const override; + int countInheritanceNodes() const override; + int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, int lt2,bool invert,bool showAlways,ClassDefSet &visitedClasses) const override; - virtual void writeMemberDeclarations(OutputList &ol,ClassDefSet &visitedClasses, + void writeMemberDeclarations(OutputList &ol,ClassDefSet &visitedClasses, MemberListType lt,const QCString &title, const QCString &subTitle=QCString(), bool showInline=FALSE,const ClassDef *inheritedFrom=0, int lt2=-1,bool invert=FALSE,bool showAlways=FALSE) const override; - virtual void setRequiresClause(const QCString &req) override; + void setRequiresClause(const QCString &req) override; // inheritance graph related members - virtual CLASS_GRAPH_t inheritanceGraphType() const override; - virtual void setTypeInheritanceGraph(CLASS_GRAPH_t e) override; + CLASS_GRAPH_t inheritanceGraphType() const override; + void setTypeInheritanceGraph(CLASS_GRAPH_t e) override; // collaboration graph related members - virtual bool hasCollaborationGraph() const override; - virtual void enableCollaborationGraph(bool e) override; + bool hasCollaborationGraph() const override; + void enableCollaborationGraph(bool e) override; private: void addUsedInterfaceClasses(MemberDef *md,const QCString &typeStr); void showUsedFiles(OutputList &ol) const; @@ -417,214 +417,214 @@ class ClassDefAliasImpl : public DefinitionAliasMixin public: ClassDefAliasImpl(const Definition *newScope,const ClassDef *cd) : DefinitionAliasMixin(newScope,cd) { init(); } - virtual ~ClassDefAliasImpl() { deinit(); } - virtual DefType definitionType() const { return TypeClass; } + ~ClassDefAliasImpl() { deinit(); } + DefType definitionType() const override { return TypeClass; } const ClassDef *getCdAlias() const { return toClassDef(getAlias()); } - virtual ClassDef *resolveAlias() { return const_cast(getCdAlias()); } + ClassDef *resolveAlias() { return const_cast(getCdAlias()); } - virtual CodeSymbolType codeSymbolType() const + CodeSymbolType codeSymbolType() const override { return getCdAlias()->codeSymbolType(); } - virtual QCString getOutputFileBase() const + QCString getOutputFileBase() const override { return getCdAlias()->getOutputFileBase(); } - virtual QCString getInstanceOutputFileBase() const + QCString getInstanceOutputFileBase() const override { return getCdAlias()->getInstanceOutputFileBase(); } - virtual QCString getSourceFileBase() const + QCString getSourceFileBase() const override { return getCdAlias()->getSourceFileBase(); } - virtual QCString getReference() const + QCString getReference() const override { return getCdAlias()->getReference(); } - virtual bool isReference() const + bool isReference() const override { return getCdAlias()->isReference(); } - virtual bool isLocal() const + bool isLocal() const override { return getCdAlias()->isLocal(); } - virtual ClassLinkedRefMap getClasses() const + ClassLinkedRefMap getClasses() const override { return getCdAlias()->getClasses(); } - virtual bool hasDocumentation() const + bool hasDocumentation() const override { return getCdAlias()->hasDocumentation(); } - virtual bool hasDetailedDescription() const + bool hasDetailedDescription() const override { return getCdAlias()->hasDetailedDescription(); } - virtual QCString collaborationGraphFileName() const + QCString collaborationGraphFileName() const override { return getCdAlias()->collaborationGraphFileName(); } - virtual QCString inheritanceGraphFileName() const + QCString inheritanceGraphFileName() const override { return getCdAlias()->inheritanceGraphFileName(); } - virtual QCString displayName(bool includeScope=TRUE) const + QCString displayName(bool includeScope=TRUE) const override { return makeDisplayName(this,includeScope); } - virtual CompoundType compoundType() const + CompoundType compoundType() const override { return getCdAlias()->compoundType(); } - virtual QCString compoundTypeString() const + QCString compoundTypeString() const override { return getCdAlias()->compoundTypeString(); } - virtual const BaseClassList &baseClasses() const + const BaseClassList &baseClasses() const override { return getCdAlias()->baseClasses(); } - virtual const BaseClassList &subClasses() const + const BaseClassList &subClasses() const override { return getCdAlias()->subClasses(); } - virtual const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const + const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const override { return getCdAlias()->memberNameInfoLinkedMap(); } - virtual Protection protection() const + Protection protection() const override { return getCdAlias()->protection(); } - virtual bool isLinkableInProject() const + bool isLinkableInProject() const override { return getCdAlias()->isLinkableInProject(); } - virtual bool isLinkable() const + bool isLinkable() const override { return getCdAlias()->isLinkable(); } - virtual bool isVisibleInHierarchy() const + bool isVisibleInHierarchy() const override { return getCdAlias()->isVisibleInHierarchy(); } - virtual bool visibleInParentsDeclList() const + bool visibleInParentsDeclList() const override { return getCdAlias()->visibleInParentsDeclList(); } - virtual const ArgumentList &templateArguments() const + const ArgumentList &templateArguments() const override { return getCdAlias()->templateArguments(); } - //virtual NamespaceDef *getNamespaceDef() const + //NamespaceDef *getNamespaceDef() const override //{ return getCdAlias()->getNamespaceDef(); } - virtual FileDef *getFileDef() const + FileDef *getFileDef() const override { return getCdAlias()->getFileDef(); } - virtual ModuleDef *getModuleDef() const + ModuleDef *getModuleDef() const override { return getCdAlias()->getModuleDef(); } - virtual const MemberDef *getMemberByName(const QCString &s) const + const MemberDef *getMemberByName(const QCString &s) const override { return getCdAlias()->getMemberByName(s); } - virtual int isBaseClass(const ClassDef *bcd,bool followInstances,const QCString &templSpec) const + int isBaseClass(const ClassDef *bcd,bool followInstances,const QCString &templSpec) const override { return getCdAlias()->isBaseClass(bcd,followInstances,templSpec); } - virtual bool isSubClass(ClassDef *bcd,int level=0) const + bool isSubClass(ClassDef *bcd,int level=0) const override { return getCdAlias()->isSubClass(bcd,level); } - virtual bool isAccessibleMember(const MemberDef *md) const + bool isAccessibleMember(const MemberDef *md) const override { return getCdAlias()->isAccessibleMember(md); } - virtual const TemplateInstanceList &getTemplateInstances() const + const TemplateInstanceList &getTemplateInstances() const override { return getCdAlias()->getTemplateInstances(); } - virtual const ClassDef *templateMaster() const + const ClassDef *templateMaster() const override { return getCdAlias()->templateMaster(); } - virtual bool isTemplate() const + bool isTemplate() const override { return getCdAlias()->isTemplate(); } - virtual const IncludeInfo *includeInfo() const + const IncludeInfo *includeInfo() const override { return getCdAlias()->includeInfo(); } - virtual const UsesClassList &usedImplementationClasses() const + const UsesClassList &usedImplementationClasses() const override { return getCdAlias()->usedImplementationClasses(); } - virtual const UsesClassList &usedByImplementationClasses() const + const UsesClassList &usedByImplementationClasses() const override { return getCdAlias()->usedByImplementationClasses(); } - virtual const ConstraintClassList &templateTypeConstraints() const + const ConstraintClassList &templateTypeConstraints() const override { return getCdAlias()->templateTypeConstraints(); } - virtual bool isTemplateArgument() const + bool isTemplateArgument() const override { return getCdAlias()->isTemplateArgument(); } - virtual const Definition *findInnerCompound(const QCString &name) const + const Definition *findInnerCompound(const QCString &name) const override { return getCdAlias()->findInnerCompound(name); } - virtual ArgumentLists getTemplateParameterLists() const + ArgumentLists getTemplateParameterLists() const override { return getCdAlias()->getTemplateParameterLists(); } - virtual QCString qualifiedNameWithTemplateParameters( - const ArgumentLists *actualParams=0,uint32_t *actualParamIndex=0) const + QCString qualifiedNameWithTemplateParameters( + const ArgumentLists *actualParams=0,uint32_t *actualParamIndex=0) const override { return makeQualifiedNameWithTemplateParameters(this,actualParams,actualParamIndex); } - virtual bool isAbstract() const + bool isAbstract() const override { return getCdAlias()->isAbstract(); } - virtual bool isObjectiveC() const + bool isObjectiveC() const override { return getCdAlias()->isObjectiveC(); } - virtual bool isFortran() const + bool isFortran() const override { return getCdAlias()->isFortran(); } - virtual bool isCSharp() const + bool isCSharp() const override { return getCdAlias()->isCSharp(); } - virtual bool isFinal() const + bool isFinal() const override { return getCdAlias()->isFinal(); } - virtual bool isSealed() const + bool isSealed() const override { return getCdAlias()->isSealed(); } - virtual bool isPublished() const + bool isPublished() const override { return getCdAlias()->isPublished(); } - virtual bool isExtension() const + bool isExtension() const override { return getCdAlias()->isExtension(); } - virtual bool isForwardDeclared() const + bool isForwardDeclared() const override { return getCdAlias()->isForwardDeclared(); } - virtual bool isInterface() const + bool isInterface() const override { return getCdAlias()->isInterface(); } - virtual ClassDef *categoryOf() const + ClassDef *categoryOf() const override { return getCdAlias()->categoryOf(); } - virtual QCString className() const + QCString className() const override { return getCdAlias()->className(); } - virtual MemberList *getMemberList(MemberListType lt) const + MemberList *getMemberList(MemberListType lt) const override { return getCdAlias()->getMemberList(lt); } - virtual const MemberLists &getMemberLists() const + const MemberLists &getMemberLists() const override { return getCdAlias()->getMemberLists(); } - virtual const MemberGroupList &getMemberGroups() const + const MemberGroupList &getMemberGroups() const override { return getCdAlias()->getMemberGroups(); } - virtual const TemplateNameMap &getTemplateBaseClassNames() const + const TemplateNameMap &getTemplateBaseClassNames() const override { return getCdAlias()->getTemplateBaseClassNames(); } - virtual bool isUsedOnly() const + bool isUsedOnly() const override { return getCdAlias()->isUsedOnly(); } - virtual QCString anchor() const + QCString anchor() const override { return getCdAlias()->anchor(); } - virtual bool isEmbeddedInOuterScope() const + bool isEmbeddedInOuterScope() const override { return getCdAlias()->isEmbeddedInOuterScope(); } - virtual bool isSimple() const + bool isSimple() const override { return getCdAlias()->isSimple(); } - virtual const ClassDef *tagLessReference() const + const ClassDef *tagLessReference() const override { return getCdAlias()->tagLessReference(); } - virtual const MemberDef *isSmartPointer() const + const MemberDef *isSmartPointer() const override { return getCdAlias()->isSmartPointer(); } - virtual bool isJavaEnum() const + bool isJavaEnum() const override { return getCdAlias()->isJavaEnum(); } - virtual QCString title() const + QCString title() const override { return getCdAlias()->title(); } - virtual QCString generatedFromFiles() const + QCString generatedFromFiles() const override { return getCdAlias()->generatedFromFiles(); } - virtual const FileList &usedFiles() const + const FileList &usedFiles() const override { return getCdAlias()->usedFiles(); } - virtual const ArgumentList &typeConstraints() const + const ArgumentList &typeConstraints() const override { return getCdAlias()->typeConstraints(); } - virtual const ExampleList &getExamples() const + const ExampleList &getExamples() const override { return getCdAlias()->getExamples(); } - virtual bool hasExamples() const + bool hasExamples() const override { return getCdAlias()->hasExamples(); } - virtual QCString getMemberListFileName() const + QCString getMemberListFileName() const override { return getCdAlias()->getMemberListFileName(); } - virtual bool subGrouping() const + bool subGrouping() const override { return getCdAlias()->subGrouping(); } - virtual bool isSliceLocal() const + bool isSliceLocal() const override { return getCdAlias()->isSliceLocal(); } - virtual bool hasNonReferenceSuperClass() const + bool hasNonReferenceSuperClass() const override { return getCdAlias()->hasNonReferenceSuperClass(); } - virtual QCString requiresClause() const + QCString requiresClause() const override { return getCdAlias()->requiresClause(); } - virtual StringVector getQualifiers() const + StringVector getQualifiers() const override { return getCdAlias()->getQualifiers(); } - virtual int countMembersIncludingGrouped(MemberListType lt,const ClassDef *inheritedFrom,bool additional) const + int countMembersIncludingGrouped(MemberListType lt,const ClassDef *inheritedFrom,bool additional) const override { return getCdAlias()->countMembersIncludingGrouped(lt,inheritedFrom,additional); } - virtual int countInheritanceNodes() const + int countInheritanceNodes() const override { return getCdAlias()->countInheritanceNodes(); } - virtual int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, - int lt2,bool invert,bool showAlways,ClassDefSet &visitedClasses) const + int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, + int lt2,bool invert,bool showAlways,ClassDefSet &visitedClasses) const override { return getCdAlias()->countMemberDeclarations(lt,inheritedFrom,lt2,invert,showAlways,visitedClasses); } - virtual void writeDeclarationLink(OutputList &ol,bool &found, - const QCString &header,bool localNames) const + void writeDeclarationLink(OutputList &ol,bool &found, + const QCString &header,bool localNames) const override { getCdAlias()->writeDeclarationLink(ol,found,header,localNames); } - virtual ClassDef *insertTemplateInstance(const QCString &fileName,int startLine,int startColumn, - const QCString &templSpec,bool &freshInstance) const + ClassDef *insertTemplateInstance(const QCString &fileName,int startLine,int startColumn, + const QCString &templSpec,bool &freshInstance) const override { return getCdAlias()->insertTemplateInstance(fileName,startLine,startColumn,templSpec,freshInstance); } - virtual void writeDocumentation(OutputList &ol) const + void writeDocumentation(OutputList &ol) const override { getCdAlias()->writeDocumentation(ol); } - virtual void writeDocumentationForInnerClasses(OutputList &ol) const + void writeDocumentationForInnerClasses(OutputList &ol) const override { getCdAlias()->writeDocumentationForInnerClasses(ol); } - virtual void writeMemberPages(OutputList &ol) const + void writeMemberPages(OutputList &ol) const override { getCdAlias()->writeMemberPages(ol); } - virtual void writeMemberList(OutputList &ol) const + void writeMemberList(OutputList &ol) const override { getCdAlias()->writeMemberList(ol); } - virtual void writeDeclaration(OutputList &ol,const MemberDef *md,bool inGroup, - int indentLevel, const ClassDef *inheritedFrom,const QCString &inheritId) const + void writeDeclaration(OutputList &ol,const MemberDef *md,bool inGroup, + int indentLevel, const ClassDef *inheritedFrom,const QCString &inheritId) const override { getCdAlias()->writeDeclaration(ol,md,inGroup,indentLevel,inheritedFrom,inheritId); } - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const + void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override { getCdAlias()->writeQuickMemberLinks(ol,md); } - virtual void writeSummaryLinks(OutputList &ol) const + void writeSummaryLinks(OutputList &ol) const override { getCdAlias()->writeSummaryLinks(ol); } - virtual void writeInlineDocumentation(OutputList &ol) const + void writeInlineDocumentation(OutputList &ol) const override { getCdAlias()->writeInlineDocumentation(ol); } - virtual void writeTagFile(TextStream &ol) const + void writeTagFile(TextStream &ol) const override { getCdAlias()->writeTagFile(ol); } - virtual void writeMemberDeclarations(OutputList &ol,ClassDefSet &visitedClasses, + void writeMemberDeclarations(OutputList &ol,ClassDefSet &visitedClasses, MemberListType lt,const QCString &title, const QCString &subTitle=QCString(), bool showInline=FALSE,const ClassDef *inheritedFrom=0, - int lt2=-1,bool invert=FALSE,bool showAlways=FALSE) const + int lt2=-1,bool invert=FALSE,bool showAlways=FALSE) const override { getCdAlias()->writeMemberDeclarations(ol,visitedClasses,lt,title,subTitle,showInline,inheritedFrom,lt2,invert,showAlways); } - virtual void addGroupedInheritedMembers(OutputList &ol,MemberListType lt, - const ClassDef *inheritedFrom,const QCString &inheritId) const + void addGroupedInheritedMembers(OutputList &ol,MemberListType lt, + const ClassDef *inheritedFrom,const QCString &inheritId) const override { getCdAlias()->addGroupedInheritedMembers(ol,lt,inheritedFrom,inheritId); } - virtual void updateBaseClasses(const BaseClassList &) {} - virtual void updateSubClasses(const BaseClassList &) {} + void updateBaseClasses(const BaseClassList &) override {} + void updateSubClasses(const BaseClassList &) override {} }; std::unique_ptr createClassDefAlias(const Definition *newScope,const ClassDef *cd) diff --git a/src/conceptdef.cpp b/src/conceptdef.cpp index 83426684157..eef36d0832e 100644 --- a/src/conceptdef.cpp +++ b/src/conceptdef.cpp @@ -38,36 +38,36 @@ class ConceptDefImpl : public DefinitionMixin ConceptDef *resolveAlias() { return this; } //---------- ConceptDef - virtual DefType definitionType() const override; - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Concept; } - virtual QCString getOutputFileBase() const override; - virtual bool hasDetailedDescription() const override; - virtual QCString displayName(bool includeScope=true) const override; - virtual const IncludeInfo *includeInfo() const override; - virtual ArgumentList getTemplateParameterList() const override; - virtual QCString anchor() const override; - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual QCString initializer() const override; - virtual void writeDeclarationLink(OutputList &ol,bool &found, + DefType definitionType() const override; + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Concept; } + QCString getOutputFileBase() const override; + bool hasDetailedDescription() const override; + QCString displayName(bool includeScope=true) const override; + const IncludeInfo *includeInfo() const override; + ArgumentList getTemplateParameterList() const override; + QCString anchor() const override; + bool isLinkableInProject() const override; + bool isLinkable() const override; + QCString initializer() const override; + void writeDeclarationLink(OutputList &ol,bool &found, const QCString &header,bool localNames) const override; - virtual const NamespaceDef *getNamespaceDef() const override; - virtual const FileDef *getFileDef() const override; - virtual const ModuleDef *getModuleDef() const override; - virtual QCString title() const override; - virtual int groupId() const override; + const NamespaceDef *getNamespaceDef() const override; + const FileDef *getFileDef() const override; + const ModuleDef *getModuleDef() const override; + QCString title() const override; + int groupId() const override; //---------- ConceptDefMutable - virtual void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override; - virtual void setTemplateArguments(const ArgumentList &al) override; - virtual void setNamespace(NamespaceDef *nd) override; - virtual void setFileDef(FileDef *fd) override; - virtual void setModuleDef(ModuleDef *mod) override; - virtual void writeTagFile(TextStream &) override; - virtual void writeDocumentation(OutputList &) override; - virtual void setInitializer(const QCString &init) override; - virtual void findSectionsInDocumentation() override; - virtual void setGroupId(int id) override; + void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override; + void setTemplateArguments(const ArgumentList &al) override; + void setNamespace(NamespaceDef *nd) override; + void setFileDef(FileDef *fd) override; + void setModuleDef(ModuleDef *mod) override; + void writeTagFile(TextStream &) override; + void writeDocumentation(OutputList &) override; + void setInitializer(const QCString &init) override; + void findSectionsInDocumentation() override; + void setGroupId(int id) override; //---------- Helpers void writeBriefDescription(OutputList &) const; @@ -102,48 +102,48 @@ class ConceptDefAliasImpl : public DefinitionAliasMixin public: ConceptDefAliasImpl(const Definition *newScope,const ConceptDef *cd) : DefinitionAliasMixin(newScope,cd) { init(); } - virtual ~ConceptDefAliasImpl() { deinit(); } + ~ConceptDefAliasImpl() { deinit(); } const ConceptDef *getCdAlias() const { return toConceptDef(getAlias()); } - virtual ConceptDef *resolveAlias() { return const_cast(getCdAlias()); } + ConceptDef *resolveAlias() { return const_cast(getCdAlias()); } - virtual DefType definitionType() const { return TypeConcept; } - virtual CodeSymbolType codeSymbolType() const + DefType definitionType() const override { return TypeConcept; } + CodeSymbolType codeSymbolType() const override { return getCdAlias()->codeSymbolType(); } - virtual QCString getOutputFileBase() const + QCString getOutputFileBase() const override { return getCdAlias()->getOutputFileBase(); } - virtual QCString getReference() const + QCString getReference() const override { return getCdAlias()->getReference(); } - virtual bool isReference() const + bool isReference() const override { return getCdAlias()->isReference(); } - virtual bool hasDetailedDescription() const + bool hasDetailedDescription() const override { return getCdAlias()->hasDetailedDescription(); } - virtual QCString displayName(bool includeScope=true) const + QCString displayName(bool includeScope=true) const override { return getCdAlias()->displayName(includeScope); } - virtual const IncludeInfo *includeInfo() const + const IncludeInfo *includeInfo() const override { return getCdAlias()->includeInfo(); } - virtual ArgumentList getTemplateParameterList() const + ArgumentList getTemplateParameterList() const override { return getCdAlias()->getTemplateParameterList(); } - virtual QCString anchor() const + QCString anchor() const override { return getCdAlias()->anchor(); } - virtual bool isLinkableInProject() const + bool isLinkableInProject() const override { return getCdAlias()->isLinkableInProject(); } - virtual bool isLinkable() const + bool isLinkable() const override { return getCdAlias()->isLinkable(); } - virtual QCString initializer() const + QCString initializer() const override { return getCdAlias()->initializer(); } - virtual const NamespaceDef *getNamespaceDef() const + const NamespaceDef *getNamespaceDef() const override { return getCdAlias()->getNamespaceDef(); } - virtual const FileDef *getFileDef() const + const FileDef *getFileDef() const override { return getCdAlias()->getFileDef(); } - virtual const ModuleDef *getModuleDef() const + const ModuleDef *getModuleDef() const override { return getCdAlias()->getModuleDef(); } - virtual QCString title() const + QCString title() const override { return getCdAlias()->title(); } - virtual void writeDeclarationLink(OutputList &ol,bool &found, - const QCString &header,bool localNames) const + void writeDeclarationLink(OutputList &ol,bool &found, + const QCString &header,bool localNames) const override { getCdAlias()->writeDeclarationLink(ol,found,header,localNames); } - virtual int groupId() const + int groupId() const override { return getCdAlias()->groupId(); } }; diff --git a/src/definitionimpl.h b/src/definitionimpl.h index e9b775c6e8d..1b27abdb9a7 100644 --- a/src/definitionimpl.h +++ b/src/definitionimpl.h @@ -32,7 +32,7 @@ class DefinitionImpl const QCString &defFileName,int defLine,int defColumn, const QCString &name,const char *b=0,const char *d=0, bool isSymbol=TRUE); - virtual ~DefinitionImpl(); + ~DefinitionImpl(); const QCString &name() const; bool isAnonymous() const; @@ -150,140 +150,140 @@ class DefinitionMixin : public Base const QCString &defFileName,int defLine,int defColumn, const QCString &name,const char *b=0,const char *d=0, bool isSymbol=TRUE) : m_impl(this,defFileName,defLine,defColumn,name,b,d,isSymbol) {} - virtual ~DefinitionMixin() = default; + ~DefinitionMixin() = default; - virtual bool isAlias() const override { return FALSE; } + bool isAlias() const override { return FALSE; } //======== Definition - virtual const QCString &name() const override { return m_impl.name(); } - virtual bool isAnonymous() const override { return m_impl.isAnonymous(); } - virtual const QCString &localName() const override { return m_impl.localName(); } - virtual QCString qualifiedName() const override { return m_impl.qualifiedName(); } - virtual QCString symbolName() const override { return m_impl.symbolName(); } - virtual QCString getSourceFileBase() const override { return m_impl.getSourceFileBase(); } - virtual QCString getSourceAnchor() const override { return m_impl.getSourceAnchor(); } - virtual QCString documentation() const override { return m_impl.documentation(); } - virtual int docLine() const override { return m_impl.docLine(); } - virtual QCString docFile() const override { return m_impl.docFile(); } - virtual QCString briefDescription(bool abbreviate=FALSE) const override { return m_impl.briefDescription(abbreviate); } - virtual QCString briefDescriptionAsTooltip() const override { return m_impl.briefDescriptionAsTooltip(); } - virtual int briefLine() const override { return m_impl.briefLine(); } - virtual QCString inbodyDocumentation() const override { return m_impl.inbodyDocumentation(); } - virtual QCString inbodyFile() const override { return m_impl.inbodyFile(); } - virtual int inbodyLine() const override { return m_impl.inbodyLine(); } - virtual QCString briefFile() const override { return m_impl.briefFile(); } - virtual QCString getDefFileName() const override { return m_impl.getDefFileName(); } - virtual QCString getDefFileExtension() const override { return m_impl.getDefFileExtension(); } - virtual int getDefLine() const override { return m_impl.getDefLine(); } - virtual int getDefColumn() const override { return m_impl.getDefColumn(); } - virtual bool hasDocumentation() const override { return m_impl.hasDocumentation(); } - virtual bool hasUserDocumentation() const override { return m_impl.hasUserDocumentation(); } - virtual bool isVisibleInProject() const override { return m_impl.isVisibleInProject(); } - virtual bool isVisible() const override { return m_impl.isVisible(); } - virtual bool isHidden() const override { return m_impl.isHidden(); } - virtual bool isArtificial() const override { return m_impl.isArtificial(); } - virtual bool isExported() const override { return m_impl.isExported(); } - virtual QCString getReference() const override { return m_impl.getReference(); } - virtual bool isReference() const override { return m_impl.isReference(); } - virtual QCString externalReference(const QCString &relPath) const override { return m_impl.externalReference(relPath); } - virtual int getStartDefLine() const override { return m_impl.getStartDefLine(); } - virtual int getStartBodyLine() const override { return m_impl.getStartBodyLine(); } - virtual int getEndBodyLine() const override { return m_impl.getEndBodyLine(); } - virtual const FileDef *getBodyDef() const override { return m_impl.getBodyDef(); } - virtual SrcLangExt getLanguage() const override { return m_impl.getLanguage(); } - virtual const GroupList &partOfGroups() const override { return m_impl.partOfGroups(); } - virtual bool isLinkableViaGroup() const override { return m_impl.isLinkableViaGroup(); } - virtual const RefItemVector &xrefListItems() const override { return m_impl.xrefListItems(); } - virtual const Definition *findInnerCompound(const QCString &name) const override { return m_impl.findInnerCompound(name); } - virtual Definition *getOuterScope() const override { return m_impl.getOuterScope(); } - virtual const MemberVector &getReferencesMembers() const override { return m_impl.getReferencesMembers(); } - virtual const MemberVector &getReferencedByMembers() const override { return m_impl.getReferencedByMembers(); } - virtual bool hasSections() const override { return m_impl.hasSections(); } - virtual bool hasSources() const override { return m_impl.hasSources(); } - virtual bool hasBriefDescription() const override { return m_impl.hasBriefDescription(); } - virtual QCString id() const override { return m_impl.id(); } - virtual const SectionRefs &getSectionRefs() const override { return m_impl.getSectionRefs(); } + const QCString &name() const override { return m_impl.name(); } + bool isAnonymous() const override { return m_impl.isAnonymous(); } + const QCString &localName() const override { return m_impl.localName(); } + QCString qualifiedName() const override { return m_impl.qualifiedName(); } + QCString symbolName() const override { return m_impl.symbolName(); } + QCString getSourceFileBase() const override { return m_impl.getSourceFileBase(); } + QCString getSourceAnchor() const override { return m_impl.getSourceAnchor(); } + QCString documentation() const override { return m_impl.documentation(); } + int docLine() const override { return m_impl.docLine(); } + QCString docFile() const override { return m_impl.docFile(); } + QCString briefDescription(bool abbreviate=FALSE) const override { return m_impl.briefDescription(abbreviate); } + QCString briefDescriptionAsTooltip() const override { return m_impl.briefDescriptionAsTooltip(); } + int briefLine() const override { return m_impl.briefLine(); } + QCString inbodyDocumentation() const override { return m_impl.inbodyDocumentation(); } + QCString inbodyFile() const override { return m_impl.inbodyFile(); } + int inbodyLine() const override { return m_impl.inbodyLine(); } + QCString briefFile() const override { return m_impl.briefFile(); } + QCString getDefFileName() const override { return m_impl.getDefFileName(); } + QCString getDefFileExtension() const override { return m_impl.getDefFileExtension(); } + int getDefLine() const override { return m_impl.getDefLine(); } + int getDefColumn() const override { return m_impl.getDefColumn(); } + bool hasDocumentation() const override { return m_impl.hasDocumentation(); } + bool hasUserDocumentation() const override { return m_impl.hasUserDocumentation(); } + bool isVisibleInProject() const override { return m_impl.isVisibleInProject(); } + bool isVisible() const override { return m_impl.isVisible(); } + bool isHidden() const override { return m_impl.isHidden(); } + bool isArtificial() const override { return m_impl.isArtificial(); } + bool isExported() const override { return m_impl.isExported(); } + QCString getReference() const override { return m_impl.getReference(); } + bool isReference() const override { return m_impl.isReference(); } + QCString externalReference(const QCString &relPath) const override { return m_impl.externalReference(relPath); } + int getStartDefLine() const override { return m_impl.getStartDefLine(); } + int getStartBodyLine() const override { return m_impl.getStartBodyLine(); } + int getEndBodyLine() const override { return m_impl.getEndBodyLine(); } + const FileDef *getBodyDef() const override { return m_impl.getBodyDef(); } + SrcLangExt getLanguage() const override { return m_impl.getLanguage(); } + const GroupList &partOfGroups() const override { return m_impl.partOfGroups(); } + bool isLinkableViaGroup() const override { return m_impl.isLinkableViaGroup(); } + const RefItemVector &xrefListItems() const override { return m_impl.xrefListItems(); } + const Definition *findInnerCompound(const QCString &name) const override { return m_impl.findInnerCompound(name); } + Definition *getOuterScope() const override { return m_impl.getOuterScope(); } + const MemberVector &getReferencesMembers() const override { return m_impl.getReferencesMembers(); } + const MemberVector &getReferencedByMembers() const override { return m_impl.getReferencedByMembers(); } + bool hasSections() const override { return m_impl.hasSections(); } + bool hasSources() const override { return m_impl.hasSources(); } + bool hasBriefDescription() const override { return m_impl.hasBriefDescription(); } + QCString id() const override { return m_impl.id(); } + const SectionRefs &getSectionRefs() const override { return m_impl.getSectionRefs(); } //======== DefinitionMutable - virtual void setName(const QCString &name) override { m_impl.setName(name); } - virtual void setId(const QCString &name) override { m_impl.setId(name); } - virtual void setDefFile(const QCString& df,int defLine,int defColumn) override + void setName(const QCString &name) override { m_impl.setName(name); } + void setId(const QCString &name) override { m_impl.setId(name); } + void setDefFile(const QCString& df,int defLine,int defColumn) override { m_impl.setDefFile(df,defLine,defColumn); } - virtual void setDocumentation(const QCString &doc,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE) override + void setDocumentation(const QCString &doc,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE) override { m_impl.setDocumentation(doc,docFile,docLine,stripWhiteSpace); } - virtual void setBriefDescription(const QCString &brief,const QCString &briefFile,int briefLine) override + void setBriefDescription(const QCString &brief,const QCString &briefFile,int briefLine) override { m_impl.setBriefDescription(brief,briefFile,briefLine); } - virtual void setInbodyDocumentation(const QCString &doc,const QCString &docFile,int docLine) override + void setInbodyDocumentation(const QCString &doc,const QCString &docFile,int docLine) override { m_impl.setInbodyDocumentation(doc,docFile,docLine); } - virtual void setReference(const QCString &r) override + void setReference(const QCString &r) override { m_impl.setReference(r); } - virtual void addSectionsToDefinition(const std::vector &anchorList) override + void addSectionsToDefinition(const std::vector &anchorList) override { m_impl.addSectionsToDefinition(anchorList); } - virtual void setBodySegment(int defLine,int bls,int ble) override + void setBodySegment(int defLine,int bls,int ble) override { m_impl.setBodySegment(defLine,bls,ble); } - virtual void setBodyDef(const FileDef *fd) override + void setBodyDef(const FileDef *fd) override { m_impl.setBodyDef(fd); } - virtual void addSourceReferencedBy(MemberDef *md) override + void addSourceReferencedBy(MemberDef *md) override { m_impl.addSourceReferencedBy(md); } - virtual void addSourceReferences(MemberDef *md) override + void addSourceReferences(MemberDef *md) override { m_impl.addSourceReferences(md); } - virtual void setRefItems(const RefItemVector &sli) override + void setRefItems(const RefItemVector &sli) override { m_impl.setRefItems(sli); } - virtual void mergeRefItems(Definition *def) override + void mergeRefItems(Definition *def) override { m_impl.mergeRefItems(def); } - virtual void mergeReferences(const Definition *other) override + void mergeReferences(const Definition *other) override { m_impl.mergeReferences(other); } - virtual void mergeReferencedBy(const Definition *other) override + void mergeReferencedBy(const Definition *other) override { m_impl.mergeReferencedBy(other); } - virtual void addInnerCompound(Definition *def) override + void addInnerCompound(Definition *def) override { m_impl.addInnerCompound(def); } - virtual void setOuterScope(Definition *def) override + void setOuterScope(Definition *def) override { m_impl.setOuterScope(def); } - virtual void setHidden(bool b) override + void setHidden(bool b) override { m_impl.setHidden(b); } - virtual void setArtificial(bool b) override + void setArtificial(bool b) override { m_impl.setArtificial(b); } - virtual void setExported(bool b) override + void setExported(bool b) override { m_impl.setExported(b); } - virtual void setLanguage(SrcLangExt lang) override + void setLanguage(SrcLangExt lang) override { m_impl.setLanguage(lang); } - virtual void writeSourceDef(OutputList &ol,const QCString &scopeName) const override + void writeSourceDef(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceDef(ol,scopeName); } - virtual void writeInlineCode(OutputList &ol,const QCString &scopeName) const override + void writeInlineCode(OutputList &ol,const QCString &scopeName) const override { m_impl.writeInlineCode(ol,scopeName); } - virtual bool hasSourceRefs() const override + bool hasSourceRefs() const override { return m_impl.hasSourceRefs(); } - virtual bool hasSourceReffedBy() const override + bool hasSourceReffedBy() const override { return m_impl.hasSourceReffedBy(); } - virtual void writeSourceRefs(OutputList &ol,const QCString &scopeName) const override + void writeSourceRefs(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceRefs(ol,scopeName); } - virtual void writeSourceReffedBy(OutputList &ol,const QCString &scopeName) const override + void writeSourceReffedBy(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceReffedBy(ol,scopeName); } - virtual void makePartOfGroup(GroupDef *gd) override + void makePartOfGroup(GroupDef *gd) override { m_impl.makePartOfGroup(gd); } - virtual void writeNavigationPath(OutputList &ol) const override + void writeNavigationPath(OutputList &ol) const override { m_impl.writeNavigationPath(ol); } - virtual QCString navigationPathAsString() const override + QCString navigationPathAsString() const override { return m_impl.navigationPathAsString(); } - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override + void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override { m_impl.writeQuickMemberLinks(ol,md); } - virtual void writeSummaryLinks(OutputList &ol) const override + void writeSummaryLinks(OutputList &ol) const override { m_impl.writeSummaryLinks(ol); } - virtual QCString pathFragment() const override + QCString pathFragment() const override { return m_impl.pathFragment(); } - virtual void writeDocAnchorsToTagFile(TextStream &fs) const override + void writeDocAnchorsToTagFile(TextStream &fs) const override { m_impl.writeDocAnchorsToTagFile(fs); } - virtual void setLocalName(const QCString &name) override + void setLocalName(const QCString &name) override { m_impl.setLocalName(name); } - virtual void addSectionsToIndex() override + void addSectionsToIndex() override { m_impl.addSectionsToIndex(); } - virtual void writeToc(OutputList &ol, const LocalToc <) const override + void writeToc(OutputList &ol, const LocalToc <) const override { m_impl.writeToc(ol,lt); } - virtual void computeTooltip() override + void computeTooltip() override { m_impl.computeTooltip(); } - virtual void _setSymbolName(const QCString &name) override + void _setSymbolName(const QCString &name) override { m_impl._setSymbolName(name); } - virtual QCString _symbolName() const override + QCString _symbolName() const override { return m_impl._symbolName(); } protected: @@ -291,9 +291,9 @@ class DefinitionMixin : public Base DefinitionMixin(const DefinitionMixin &def) = default; private: - virtual Definition *toDefinition_() override { return this; } - virtual DefinitionMutable *toDefinitionMutable_() override { return this; } - virtual const DefinitionImpl *toDefinitionImpl_() const override { return &m_impl; } + Definition *toDefinition_() override { return this; } + DefinitionMutable *toDefinitionMutable_() override { return this; } + const DefinitionImpl *toDefinitionImpl_() const override { return &m_impl; } DefinitionImpl m_impl; }; @@ -327,108 +327,108 @@ class DefinitionAliasMixin : public Base virtual ~DefinitionAliasMixin() = default; - virtual bool isAlias() const override { return TRUE; } + bool isAlias() const override { return TRUE; } //======== Definition - virtual const QCString &name() const override + const QCString &name() const override { return m_impl.name(); } - virtual bool isAnonymous() const override + bool isAnonymous() const override { return m_alias->isAnonymous(); } - virtual const QCString &localName() const override + const QCString &localName() const override { return m_alias->localName(); } - virtual QCString qualifiedName() const override + QCString qualifiedName() const override { return m_impl.qualifiedName(); } - virtual QCString symbolName() const override + QCString symbolName() const override { return m_alias->symbolName(); } - virtual QCString getSourceFileBase() const override + QCString getSourceFileBase() const override { return m_alias->getSourceFileBase(); } - virtual QCString getSourceAnchor() const override + QCString getSourceAnchor() const override { return m_alias->getSourceAnchor(); } - virtual QCString documentation() const override + QCString documentation() const override { return m_alias->documentation(); } - virtual int docLine() const override + int docLine() const override { return m_alias->docLine(); } - virtual QCString docFile() const override + QCString docFile() const override { return m_alias->docFile(); } - virtual QCString briefDescription(bool abbreviate=FALSE) const override + QCString briefDescription(bool abbreviate=FALSE) const override { return m_alias->briefDescription(abbreviate); } - virtual QCString briefDescriptionAsTooltip() const override + QCString briefDescriptionAsTooltip() const override { return m_alias->briefDescriptionAsTooltip(); } - virtual int briefLine() const override + int briefLine() const override { return m_alias->briefLine(); } - virtual QCString inbodyDocumentation() const override + QCString inbodyDocumentation() const override { return m_alias->inbodyDocumentation(); } - virtual QCString inbodyFile() const override + QCString inbodyFile() const override { return m_alias->inbodyFile(); } - virtual int inbodyLine() const override + int inbodyLine() const override { return m_alias->inbodyLine(); } - virtual QCString briefFile() const override + QCString briefFile() const override { return m_alias->briefFile(); } - virtual QCString getDefFileName() const override + QCString getDefFileName() const override { return m_alias->getDefFileName(); } - virtual QCString getDefFileExtension() const override + QCString getDefFileExtension() const override { return m_alias->getDefFileExtension(); } - virtual int getDefLine() const override + int getDefLine() const override { return m_alias->getDefLine(); } - virtual int getDefColumn() const override + int getDefColumn() const override { return m_alias->getDefColumn(); } - virtual bool hasDocumentation() const override + bool hasDocumentation() const override { return m_alias->hasDocumentation(); } - virtual bool hasUserDocumentation() const override + bool hasUserDocumentation() const override { return m_alias->hasUserDocumentation(); } - virtual bool isVisibleInProject() const override + bool isVisibleInProject() const override { return m_alias->isVisibleInProject(); } - virtual bool isVisible() const override + bool isVisible() const override { return m_alias->isVisible(); } - virtual bool isHidden() const override + bool isHidden() const override { return m_alias->isHidden(); } - virtual bool isArtificial() const override + bool isArtificial() const override { return m_alias->isArtificial(); } - virtual bool isExported() const override + bool isExported() const override { return m_alias->isExported(); } - virtual QCString getReference() const override + QCString getReference() const override { return m_alias->getReference(); } - virtual bool isReference() const override + bool isReference() const override { return m_alias->isReference(); } - virtual QCString externalReference(const QCString &relPath) const override + QCString externalReference(const QCString &relPath) const override { return m_alias->externalReference(relPath); } - virtual int getStartDefLine() const override + int getStartDefLine() const override { return m_alias->getStartDefLine(); } - virtual int getStartBodyLine() const override + int getStartBodyLine() const override { return m_alias->getStartBodyLine(); } - virtual int getEndBodyLine() const override + int getEndBodyLine() const override { return m_alias->getEndBodyLine(); } - virtual const FileDef *getBodyDef() const override + const FileDef *getBodyDef() const override { return m_alias->getBodyDef(); } - virtual SrcLangExt getLanguage() const override + SrcLangExt getLanguage() const override { return m_alias->getLanguage(); } - virtual const GroupList &partOfGroups() const override + const GroupList &partOfGroups() const override { return m_alias->partOfGroups(); } - virtual bool isLinkableViaGroup() const override + bool isLinkableViaGroup() const override { return m_alias->isLinkableViaGroup(); } - virtual const RefItemVector &xrefListItems() const override + const RefItemVector &xrefListItems() const override { return m_alias->xrefListItems(); } - virtual const Definition *findInnerCompound(const QCString &name) const override + const Definition *findInnerCompound(const QCString &name) const override { return m_alias->findInnerCompound(name); } - virtual Definition *getOuterScope() const override + Definition *getOuterScope() const override { return const_cast(m_scope); } - virtual const MemberVector &getReferencesMembers() const override + const MemberVector &getReferencesMembers() const override { return m_alias->getReferencesMembers(); } - virtual const MemberVector &getReferencedByMembers() const override + const MemberVector &getReferencedByMembers() const override { return m_alias->getReferencedByMembers(); } - virtual bool hasSections() const override + bool hasSections() const override { return m_alias->hasSections(); } - virtual bool hasSources() const override + bool hasSources() const override { return m_alias->hasSources(); } - virtual bool hasBriefDescription() const override + bool hasBriefDescription() const override { return m_alias->hasBriefDescription(); } - virtual QCString id() const override + QCString id() const override { return m_alias->id(); } - virtual const SectionRefs &getSectionRefs() const override + const SectionRefs &getSectionRefs() const override { return m_alias->getSectionRefs(); } - virtual QCString navigationPathAsString() const override + QCString navigationPathAsString() const override { return m_alias->navigationPathAsString(); } - virtual QCString pathFragment() const override + QCString pathFragment() const override { return m_alias->pathFragment(); } protected: @@ -437,11 +437,11 @@ class DefinitionAliasMixin : public Base private: virtual Definition *toDefinition_() { return this; } - virtual DefinitionMutable *toDefinitionMutable_() override { return 0; } - virtual const DefinitionImpl *toDefinitionImpl_() const override { return 0; } + DefinitionMutable *toDefinitionMutable_() override { return 0; } + const DefinitionImpl *toDefinitionImpl_() const override { return 0; } - virtual void _setSymbolName(const QCString &name) override { m_symbolName = name; } - virtual QCString _symbolName() const override { return m_symbolName; } + void _setSymbolName(const QCString &name) override { m_symbolName = name; } + QCString _symbolName() const override { return m_symbolName; } DefinitionAliasImpl m_impl; const Definition *m_scope; const Definition *m_alias; diff --git a/src/dirdef.cpp b/src/dirdef.cpp index d0889a3a540..168484e95f7 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -39,42 +39,42 @@ class DirDefImpl : public DefinitionMixin { public: DirDefImpl(const QCString &path); - virtual ~DirDefImpl(); - - virtual DefType definitionType() const override { return TypeDir; } - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return QCString(); } - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual QCString displayName(bool=TRUE) const override { return m_dispName; } - virtual const QCString shortName() const override { return m_shortName; } - virtual void addSubDir(DirDef *subdir) override; - virtual const FileList &getFiles() const override { return m_fileList; } - virtual void addFile(const FileDef *fd) override; - virtual const DirList &subDirs() const override { return m_subdirs; } - virtual bool hasSubdirs() const override { return !m_subdirs.empty(); } - virtual int level() const override { return m_level; } - virtual DirDef *parent() const override { return m_parent; } - virtual int dirCount() const override { return m_dirCount; } - virtual const UsedDirLinkedMap &usedDirs() const override { return m_usedDirs; } - virtual bool isParentOf(const DirDef *dir) const override; - virtual bool depGraphIsTrivial() const override; - virtual QCString shortTitle() const override; - virtual bool hasDetailedDescription() const override; - virtual void writeDocumentation(OutputList &ol) override; - virtual void writeTagFile(TextStream &t) override; - virtual void setDiskName(const QCString &name) override { m_diskName = name; } - virtual void sort() override; - virtual void setParent(DirDef *parent) override; - virtual void setDirCount(int count) override; - virtual void setLevel() override; - virtual void addUsesDependency(const DirDef *usedDir,const FileDef *srcFd, + ~DirDefImpl(); + + DefType definitionType() const override { return TypeDir; } + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } + QCString getOutputFileBase() const override; + QCString anchor() const override { return QCString(); } + bool isLinkableInProject() const override; + bool isLinkable() const override; + QCString displayName(bool=TRUE) const override { return m_dispName; } + const QCString shortName() const override { return m_shortName; } + void addSubDir(DirDef *subdir) override; + const FileList &getFiles() const override { return m_fileList; } + void addFile(const FileDef *fd) override; + const DirList &subDirs() const override { return m_subdirs; } + bool hasSubdirs() const override { return !m_subdirs.empty(); } + int level() const override { return m_level; } + DirDef *parent() const override { return m_parent; } + int dirCount() const override { return m_dirCount; } + const UsedDirLinkedMap &usedDirs() const override { return m_usedDirs; } + bool isParentOf(const DirDef *dir) const override; + bool depGraphIsTrivial() const override; + QCString shortTitle() const override; + bool hasDetailedDescription() const override; + void writeDocumentation(OutputList &ol) override; + void writeTagFile(TextStream &t) override; + void setDiskName(const QCString &name) override { m_diskName = name; } + void sort() override; + void setParent(DirDef *parent) override; + void setDirCount(int count) override; + void setLevel() override; + void addUsesDependency(const DirDef *usedDir,const FileDef *srcFd, const FileDef *dstFd,bool srcDirect, bool dstDirect) override; - virtual void computeDependencies() override; + void computeDependencies() override; - virtual bool hasDirectoryGraph() const override; - virtual void enableDirectoryGraph(bool e) override; + bool hasDirectoryGraph() const override; + void enableDirectoryGraph(bool e) override; public: static DirDef *mergeDirectoryInTree(const QCString &path); diff --git a/src/filedef.cpp b/src/filedef.cpp index 8d65c8cff7d..51e2685b690 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -121,86 +121,86 @@ class FileDefImpl : public DefinitionMixin { public: FileDefImpl(const QCString &p,const QCString &n,const QCString &ref=QCString(),const QCString &dn=QCString()); - virtual ~FileDefImpl(); - - virtual DefType definitionType() const override { return TypeFile; } - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } - virtual const QCString &name() const override; - - virtual QCString displayName(bool=TRUE) const override { return localName(); } - virtual QCString fileName() const override { return m_fileName; } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return QCString(); } - virtual QCString getSourceFileBase() const override; - virtual QCString includeName() const override; - virtual QCString includeDependencyGraphFileName() const override; - virtual QCString includedByDependencyGraphFileName() const override; - virtual QCString absFilePath() const override { return m_filePath; } - virtual const QCString &docName() const override { return m_docname; } - virtual bool isSource() const override { return m_isSource; } - virtual bool isDocumentationFile() const override; - virtual const Definition *getSourceDefinition(int lineNr) const override; - virtual const MemberDef *getSourceMember(int lineNr) const override; - virtual QCString getPath() const override { return m_path; } - virtual QCString getVersion() const override { return m_fileVersion; } - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override { return isLinkableInProject() || isReference(); } - virtual bool isIncluded(const QCString &name) const override; - virtual DirDef *getDirDef() const override { return m_dir; } - virtual ModuleDef *getModuleDef() const override { return m_moduleDef; } - virtual const LinkedRefMap &getUsedNamespaces() const override; - virtual const LinkedRefMap &getUsedClasses() const override { return m_usingDeclList; } - virtual const IncludeInfoList &includeFileList() const override { return m_includeList; } - virtual const IncludeInfoList &includedByFileList() const override { return m_includedByList; } - virtual void getAllIncludeFilesRecursively(StringVector &incFiles) const override; - virtual MemberList *getMemberList(MemberListType lt) const override; - virtual const MemberLists &getMemberLists() const override { return m_memberLists; } - virtual const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } - virtual const NamespaceLinkedRefMap &getNamespaces() const override { return m_namespaces; } - virtual const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } - virtual const ClassLinkedRefMap &getClasses() const override { return m_classes; } - virtual QCString title() const override; - virtual bool hasDetailedDescription() const override; - virtual QCString fileVersion() const override; - virtual bool subGrouping() const override { return m_subGrouping; } - virtual void countMembers() override; - virtual int numDocMembers() const override; - virtual int numDecMembers() const override; - virtual void addSourceRef(int line,const Definition *d,const MemberDef *md) override; - virtual void writeDocumentation(OutputList &ol) override; - virtual void writeMemberPages(OutputList &ol) override; - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; - virtual void writeSummaryLinks(OutputList &ol) const override; - virtual void writeTagFile(TextStream &t) override; - virtual void writeSourceHeader(OutputList &ol) override; - virtual void writeSourceBody(OutputList &ol,ClangTUParser *clangParser) override; - virtual void writeSourceFooter(OutputList &ol) override; - virtual void parseSource(ClangTUParser *clangParser) override; - virtual void setDiskName(const QCString &name) override; - virtual void insertMember(MemberDef *md) override; - virtual void insertClass(ClassDef *cd) override; - virtual void insertConcept(ConceptDef *cd) override; - virtual void insertNamespace(NamespaceDef *nd) override; - virtual void computeAnchors() override; - virtual void setDirDef(DirDef *dd) override { m_dir=dd; } - virtual void setModuleDef(ModuleDef *mod) override { m_moduleDef=mod; } - virtual void addUsingDirective(NamespaceDef *nd) override; - virtual void addUsingDeclaration(ClassDef *cd) override; - virtual void combineUsingRelations() override; - virtual bool generateSourceFile() const override; - virtual void sortMemberLists() override; - virtual void addIncludeDependency(const FileDef *fd,const QCString &incName,IncludeKind kind) override; - virtual void addIncludedByDependency(const FileDef *fd,const QCString &incName,IncludeKind kind) override; - virtual void addMembersToMemberGroup() override; - virtual void distributeMemberGroupDocumentation() override; - virtual void findSectionsInDocumentation() override; - virtual void addIncludedUsingDirectives(FileDefSet &visitedFiles) override; - virtual void addListReferences() override; - - virtual bool hasIncludeGraph() const override; - virtual bool hasIncludedByGraph() const override; - virtual void enableIncludeGraph(bool e) override; - virtual void enableIncludedByGraph(bool e) override; + ~FileDefImpl(); + + DefType definitionType() const override { return TypeFile; } + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } + const QCString &name() const override; + + QCString displayName(bool=TRUE) const override { return localName(); } + QCString fileName() const override { return m_fileName; } + QCString getOutputFileBase() const override; + QCString anchor() const override { return QCString(); } + QCString getSourceFileBase() const override; + QCString includeName() const override; + QCString includeDependencyGraphFileName() const override; + QCString includedByDependencyGraphFileName() const override; + QCString absFilePath() const override { return m_filePath; } + const QCString &docName() const override { return m_docname; } + bool isSource() const override { return m_isSource; } + bool isDocumentationFile() const override; + const Definition *getSourceDefinition(int lineNr) const override; + const MemberDef *getSourceMember(int lineNr) const override; + QCString getPath() const override { return m_path; } + QCString getVersion() const override { return m_fileVersion; } + bool isLinkableInProject() const override; + bool isLinkable() const override { return isLinkableInProject() || isReference(); } + bool isIncluded(const QCString &name) const override; + DirDef *getDirDef() const override { return m_dir; } + ModuleDef *getModuleDef() const override { return m_moduleDef; } + const LinkedRefMap &getUsedNamespaces() const override; + const LinkedRefMap &getUsedClasses() const override { return m_usingDeclList; } + const IncludeInfoList &includeFileList() const override { return m_includeList; } + const IncludeInfoList &includedByFileList() const override { return m_includedByList; } + void getAllIncludeFilesRecursively(StringVector &incFiles) const override; + MemberList *getMemberList(MemberListType lt) const override; + const MemberLists &getMemberLists() const override { return m_memberLists; } + const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } + const NamespaceLinkedRefMap &getNamespaces() const override { return m_namespaces; } + const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } + const ClassLinkedRefMap &getClasses() const override { return m_classes; } + QCString title() const override; + bool hasDetailedDescription() const override; + QCString fileVersion() const override; + bool subGrouping() const override { return m_subGrouping; } + void countMembers() override; + int numDocMembers() const override; + int numDecMembers() const override; + void addSourceRef(int line,const Definition *d,const MemberDef *md) override; + void writeDocumentation(OutputList &ol) override; + void writeMemberPages(OutputList &ol) override; + void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; + void writeSummaryLinks(OutputList &ol) const override; + void writeTagFile(TextStream &t) override; + void writeSourceHeader(OutputList &ol) override; + void writeSourceBody(OutputList &ol,ClangTUParser *clangParser) override; + void writeSourceFooter(OutputList &ol) override; + void parseSource(ClangTUParser *clangParser) override; + void setDiskName(const QCString &name) override; + void insertMember(MemberDef *md) override; + void insertClass(ClassDef *cd) override; + void insertConcept(ConceptDef *cd) override; + void insertNamespace(NamespaceDef *nd) override; + void computeAnchors() override; + void setDirDef(DirDef *dd) override { m_dir=dd; } + void setModuleDef(ModuleDef *mod) override { m_moduleDef=mod; } + void addUsingDirective(NamespaceDef *nd) override; + void addUsingDeclaration(ClassDef *cd) override; + void combineUsingRelations() override; + bool generateSourceFile() const override; + void sortMemberLists() override; + void addIncludeDependency(const FileDef *fd,const QCString &incName,IncludeKind kind) override; + void addIncludedByDependency(const FileDef *fd,const QCString &incName,IncludeKind kind) override; + void addMembersToMemberGroup() override; + void distributeMemberGroupDocumentation() override; + void findSectionsInDocumentation() override; + void addIncludedUsingDirectives(FileDefSet &visitedFiles) override; + void addListReferences() override; + + bool hasIncludeGraph() const override; + bool hasIncludedByGraph() const override; + void enableIncludeGraph(bool e) override; + void enableIncludedByGraph(bool e) override; private: void setDiskNameLocal(const QCString &name); diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 395afd7b56a..d5b8616ea57 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -54,73 +54,73 @@ class GroupDefImpl : public DefinitionMixin { public: GroupDefImpl(const QCString &fileName,int line,const QCString &name,const QCString &title,const QCString &refFileName=QCString()); - virtual ~GroupDefImpl(); - - virtual DefType definitionType() const override { return TypeGroup; } - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return QCString(); } - virtual QCString displayName(bool=TRUE) const override { return hasGroupTitle() ? m_title : DefinitionMixin::name(); } - virtual QCString groupTitle() const override { return m_title; } - virtual void setGroupTitle( const QCString &newtitle ) override; - virtual bool hasGroupTitle( ) const override { return m_titleSet; } - virtual void addFile(FileDef *def) override; - virtual bool containsFile(const FileDef *def) const override; - virtual bool addClass(ClassDef *def) override; - virtual bool addConcept(ConceptDef *def) override; - virtual bool addModule(ModuleDef *def) override; - virtual bool addNamespace(NamespaceDef *def) override; - virtual void addGroup(GroupDef *def) override; - virtual void addPage(PageDef *def) override; - virtual void addExample(PageDef *def) override; - virtual void addDir(DirDef *dd) override; - virtual bool insertMember(MemberDef *def,bool docOnly=FALSE) override; - virtual void removeMember(MemberDef *md) override; - virtual bool findGroup(const GroupDef *def) const override; // true if def is a subgroup of this group - virtual void writeDocumentation(OutputList &ol) override; - virtual void writeMemberPages(OutputList &ol, int hierarchyLevel) override; - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; - virtual void writeTagFile(TextStream &) override; - virtual size_t numDocMembers() const override; - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual bool isVisibleInHierarchy() const override; - virtual bool isASubGroup() const override; - virtual void computeAnchors() override; - virtual void countMembers() override; - - virtual void addMembersToMemberGroup() override; - virtual void distributeMemberGroupDocumentation() override; - virtual void findSectionsInDocumentation() override; - - virtual void addListReferences() override; - virtual void sortMemberLists() override; - virtual bool subGrouping() const override { return m_subGrouping; } - - virtual void setGroupScope(Definition *d) override { m_groupScope = d; } - virtual Definition *getGroupScope() const override { return m_groupScope; } - - virtual MemberList *getMemberList(MemberListType lt) const override; - virtual const MemberLists &getMemberLists() const override { return m_memberLists; } + ~GroupDefImpl(); + + DefType definitionType() const override { return TypeGroup; } + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } + QCString getOutputFileBase() const override; + QCString anchor() const override { return QCString(); } + QCString displayName(bool=TRUE) const override { return hasGroupTitle() ? m_title : DefinitionMixin::name(); } + QCString groupTitle() const override { return m_title; } + void setGroupTitle( const QCString &newtitle ) override; + bool hasGroupTitle( ) const override { return m_titleSet; } + void addFile(FileDef *def) override; + bool containsFile(const FileDef *def) const override; + bool addClass(ClassDef *def) override; + bool addConcept(ConceptDef *def) override; + bool addModule(ModuleDef *def) override; + bool addNamespace(NamespaceDef *def) override; + void addGroup(GroupDef *def) override; + void addPage(PageDef *def) override; + void addExample(PageDef *def) override; + void addDir(DirDef *dd) override; + bool insertMember(MemberDef *def,bool docOnly=FALSE) override; + void removeMember(MemberDef *md) override; + bool findGroup(const GroupDef *def) const override; // true if def is a subgroup of this group + void writeDocumentation(OutputList &ol) override; + void writeMemberPages(OutputList &ol, int hierarchyLevel) override; + void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; + void writeTagFile(TextStream &) override; + size_t numDocMembers() const override; + bool isLinkableInProject() const override; + bool isLinkable() const override; + bool isVisibleInHierarchy() const override; + bool isASubGroup() const override; + void computeAnchors() override; + void countMembers() override; + + void addMembersToMemberGroup() override; + void distributeMemberGroupDocumentation() override; + void findSectionsInDocumentation() override; + + void addListReferences() override; + void sortMemberLists() override; + bool subGrouping() const override { return m_subGrouping; } + + void setGroupScope(Definition *d) override { m_groupScope = d; } + Definition *getGroupScope() const override { return m_groupScope; } + + MemberList *getMemberList(MemberListType lt) const override; + const MemberLists &getMemberLists() const override { return m_memberLists; } /* user defined member groups */ - virtual const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } - - virtual const FileList &getFiles() const override { return m_fileList; } - virtual const ClassLinkedRefMap &getClasses() const override { return m_classes; } - virtual const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } - virtual const ModuleLinkedRefMap &getModules() const override { return m_modules; } - virtual const NamespaceLinkedRefMap &getNamespaces() const override { return m_namespaces; } - virtual const GroupList &getSubGroups() const override { return m_groups; } - virtual const PageLinkedRefMap &getPages() const override { return m_pages; } - virtual const DirList & getDirs() const override { return m_dirList; } - virtual const PageLinkedRefMap &getExamples() const override { return m_examples; } - virtual bool hasDetailedDescription() const override; - virtual void sortSubGroups() override; - virtual void writeSummaryLinks(OutputList &ol) const override; - - virtual bool hasGroupGraph() const override; - virtual void enableGroupGraph(bool e) override; + const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } + + const FileList &getFiles() const override { return m_fileList; } + const ClassLinkedRefMap &getClasses() const override { return m_classes; } + const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } + const ModuleLinkedRefMap &getModules() const override { return m_modules; } + const NamespaceLinkedRefMap &getNamespaces() const override { return m_namespaces; } + const GroupList &getSubGroups() const override { return m_groups; } + const PageLinkedRefMap &getPages() const override { return m_pages; } + const DirList & getDirs() const override { return m_dirList; } + const PageLinkedRefMap &getExamples() const override { return m_examples; } + bool hasDetailedDescription() const override; + void sortSubGroups() override; + void writeSummaryLinks(OutputList &ol) const override; + + bool hasGroupGraph() const override; + void enableGroupGraph(bool e) override; private: void addMemberListToGroup(MemberList *,bool (MemberDef::*)() const); void addMemberToList(MemberListType lt,MemberDef *md); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 71468093ce0..82104a6e574 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -59,294 +59,294 @@ class MemberDefImpl : public DefinitionMixin Relationship related,MemberType t,const ArgumentList &tal, const ArgumentList &al,const QCString &metaData); - virtual DefType definitionType() const override { return TypeMember; } - virtual MemberDef *resolveAlias() override { return this; } - virtual const MemberDef *resolveAlias() const override { return this; } - virtual CodeSymbolType codeSymbolType() const override; - virtual std::unique_ptr deepCopy() const override; - virtual void moveTo(Definition *) override; - virtual QCString getOutputFileBase() const override; - virtual QCString getReference() const override; - virtual QCString anchor() const override; - virtual QCString declaration() const override; - virtual QCString definition() const override; - virtual QCString typeString() const override; - virtual QCString argsString() const override; - virtual QCString excpString() const override; - virtual QCString bitfieldString() const override; - virtual QCString extraTypeChars() const override; - virtual const QCString &initializer() const override; - virtual int initializerLines() const override; - virtual TypeSpecifier getMemberSpecifiers() const override; - virtual VhdlSpecifier getVhdlSpecifiers() const override; - virtual const MemberList *getSectionList(const Definition *) const override; - virtual QCString displayDefinition() const override; - virtual const ClassDef *getClassDef() const override; - virtual ClassDef *getClassDef() override; - virtual const FileDef *getFileDef() const override; - virtual FileDef *getFileDef() override; - virtual const NamespaceDef* getNamespaceDef() const override; - virtual NamespaceDef* getNamespaceDef() override; - virtual const GroupDef *getGroupDef() const override; - virtual const ModuleDef *getModuleDef() const override; - virtual ClassDef *accessorClass() const override; - virtual QCString getReadAccessor() const override; - virtual QCString getWriteAccessor() const override; - virtual Grouping::GroupPri_t getGroupPri() const override; - virtual QCString getGroupFileName() const override; - virtual int getGroupStartLine() const override; - virtual bool getGroupHasDocs() const override; - virtual QCString qualifiedName() const override; - virtual QCString objCMethodName(bool localLink,bool showStatic) const override; - virtual Protection protection() const override; - virtual Specifier virtualness(int count=0) const override; - virtual MemberType memberType() const override; - virtual QCString memberTypeName() const override; - virtual bool isSignal() const override; - virtual bool isSlot() const override; - virtual bool isVariable() const override; - virtual bool isEnumerate() const override; - virtual bool isEnumValue() const override; - virtual bool isTypedef() const override; - virtual bool isSequence() const override; - virtual bool isDictionary() const override; - virtual bool isFunction() const override; - virtual bool isFunctionPtr() const override; - virtual bool isDefine() const override; - virtual bool isFriend() const override; - virtual bool isDCOP() const override; - virtual bool isProperty() const override; - virtual bool isEvent() const override; - virtual bool isRelated() const override; - virtual bool isForeign() const override; - virtual bool isStatic() const override; - virtual bool isInline() const override; - virtual bool isExplicit() const override; - virtual bool isMutable() const override; - virtual bool isGettable() const override; - virtual bool isPrivateGettable() const override; - virtual bool isProtectedGettable() const override; - virtual bool isSettable() const override; - virtual bool isPrivateSettable() const override; - virtual bool isProtectedSettable() const override; - virtual bool isReadable() const override; - virtual bool isWritable() const override; - virtual bool isAddable() const override; - virtual bool isRemovable() const override; - virtual bool isRaisable() const override; - virtual bool isFinal() const override; - virtual bool isAbstract() const override; - virtual bool isOverride() const override; - virtual bool isInitonly() const override; - virtual bool isOptional() const override; - virtual bool isRequired() const override; - virtual bool isNonAtomic() const override; - virtual bool isCopy() const override; - virtual bool isAssign() const override; - virtual bool isRetain() const override; - virtual bool isWeak() const override; - virtual bool isStrong() const override; - virtual bool isEnumStruct() const override; - virtual bool isUnretained() const override; - virtual bool isNew() const override; - virtual bool isSealed() const override; - virtual bool isImplementation() const override; - virtual bool isExternal() const override; - virtual bool isTypeAlias() const override; - virtual bool isDefault() const override; - virtual bool isDelete() const override; - virtual bool isNoExcept() const override; - virtual bool isAttribute() const override; - virtual bool isUNOProperty() const override; - virtual bool isReadonly() const override; - virtual bool isBound() const override; - virtual bool isConstrained() const override; - virtual bool isTransient() const override; - virtual bool isMaybeVoid() const override; - virtual bool isMaybeDefault() const override; - virtual bool isMaybeAmbiguous() const override; - virtual bool isPublished() const override; - virtual bool isTemplateSpecialization() const override; - virtual bool isObjCMethod() const override; - virtual bool isObjCProperty() const override; - virtual bool isCSharpProperty() const override; - virtual bool isConstructor() const override; - virtual bool isDestructor() const override; - virtual bool hasOneLineInitializer() const override; - virtual bool hasMultiLineInitializer() const override; - virtual bool isCallable() const override; - virtual bool isStrongEnumValue() const override; - virtual bool livesInsideEnum() const override; - virtual bool isSliceLocal() const override; - virtual bool isConstExpr() const override; - virtual int numberOfFlowKeyWords() const override; - virtual bool isFriendToHide() const override; - virtual bool isNotFriend() const override; - virtual bool isFunctionOrSignalSlot() const override; - virtual bool isRelatedOrFriend() const override; - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual bool hasDocumentation() const override; - virtual bool isDeleted() const override; - virtual bool isBriefSectionVisible() const override; - virtual bool isDetailedSectionVisible(MemberListContainer container) const override; - virtual bool hasDetailedDescription() const override; - virtual bool isFriendClass() const override; - virtual bool isDocumentedFriendClass() const override; - virtual const MemberDef *reimplements() const override; - virtual const MemberVector &reimplementedBy() const override; - virtual bool isReimplementedBy(const ClassDef *cd) const override; - virtual ClassDef *relatedAlso() const override; - virtual bool hasDocumentedEnumValues() const override; - virtual const MemberDef *getAnonymousEnumType() const override; - virtual bool isDocsForDefinition() const override; - virtual const MemberDef *getEnumScope() const override; - virtual const MemberVector &enumFieldList() const override; - virtual void setEnumBaseType(const QCString &type) override; - virtual QCString enumBaseType() const override; - virtual bool hasExamples() const override; - virtual const ExampleList &getExamples() const override; - virtual bool isPrototype() const override; - virtual const ArgumentList &argumentList() const override; - virtual const ArgumentList &declArgumentList() const override; - virtual const ArgumentList &templateArguments() const override; - virtual const ArgumentLists &definitionTemplateParameterLists() const override; - virtual int getMemberGroupId() const override; - virtual MemberGroup *getMemberGroup() const override; - virtual bool fromAnonymousScope() const override; - virtual MemberDef *fromAnonymousMember() const override; - virtual bool hasCallGraph() const override; - virtual bool hasCallerGraph() const override; - virtual bool hasReferencesRelation() const override; - virtual bool hasReferencedByRelation() const override; - virtual bool hasInlineSource() const override; - virtual const MemberDef *templateMaster() const override; - virtual QCString getScopeString() const override; - virtual ClassDef *getClassDefOfAnonymousType() const override; - virtual bool isTypedefValCached() const override; - virtual const ClassDef *getCachedTypedefVal() const override; - virtual QCString getCachedTypedefTemplSpec() const override; - virtual QCString getCachedResolvedTypedef() const override; - virtual MemberDef *memberDefinition() const override; - virtual MemberDef *memberDeclaration() const override; - virtual const MemberDef *inheritsDocsFrom() const override; - virtual const MemberDef *getGroupAlias() const override; - virtual ClassDef *category() const override; - virtual const MemberDef *categoryRelation() const override; - virtual QCString displayName(bool=TRUE) const override; - virtual QCString getDeclType() const override; - virtual StringVector getLabels(const Definition *container) const override; - virtual const ArgumentList &typeConstraints() const override; - virtual QCString requiresClause() const override; - virtual QCString documentation() const override; - virtual QCString briefDescription(bool abbr=FALSE) const override; - virtual QCString fieldType() const override; - virtual bool isReference() const override; - virtual QCString getDeclFileName() const override; - virtual int getDeclLine() const override; - virtual int getDeclColumn() const override; - virtual void setMemberType(MemberType t) override; - virtual void setDefinition(const QCString &d) override; - virtual void setFileDef(FileDef *fd) override; - virtual void setAnchor() override; - virtual void setProtection(Protection p) override; - virtual void setMemberSpecifiers(TypeSpecifier s) override; - virtual void setVhdlSpecifiers(VhdlSpecifier s) override; - virtual void mergeMemberSpecifiers(TypeSpecifier s) override; - virtual void setInitializer(const QCString &i) override; - virtual void setBitfields(const QCString &s) override; - virtual void setMaxInitLines(int lines) override; - virtual void setMemberClass(ClassDef *cd) override; - virtual void setSectionList(const Definition *container,const MemberList *sl) override; - virtual void setGroupDef(const GroupDef *gd,Grouping::GroupPri_t pri, + DefType definitionType() const override { return TypeMember; } + MemberDef *resolveAlias() override { return this; } + const MemberDef *resolveAlias() const override { return this; } + CodeSymbolType codeSymbolType() const override; + std::unique_ptr deepCopy() const override; + void moveTo(Definition *) override; + QCString getOutputFileBase() const override; + QCString getReference() const override; + QCString anchor() const override; + QCString declaration() const override; + QCString definition() const override; + QCString typeString() const override; + QCString argsString() const override; + QCString excpString() const override; + QCString bitfieldString() const override; + QCString extraTypeChars() const override; + const QCString &initializer() const override; + int initializerLines() const override; + TypeSpecifier getMemberSpecifiers() const override; + VhdlSpecifier getVhdlSpecifiers() const override; + const MemberList *getSectionList(const Definition *) const override; + QCString displayDefinition() const override; + const ClassDef *getClassDef() const override; + ClassDef *getClassDef() override; + const FileDef *getFileDef() const override; + FileDef *getFileDef() override; + const NamespaceDef* getNamespaceDef() const override; + NamespaceDef* getNamespaceDef() override; + const GroupDef *getGroupDef() const override; + const ModuleDef *getModuleDef() const override; + ClassDef *accessorClass() const override; + QCString getReadAccessor() const override; + QCString getWriteAccessor() const override; + Grouping::GroupPri_t getGroupPri() const override; + QCString getGroupFileName() const override; + int getGroupStartLine() const override; + bool getGroupHasDocs() const override; + QCString qualifiedName() const override; + QCString objCMethodName(bool localLink,bool showStatic) const override; + Protection protection() const override; + Specifier virtualness(int count=0) const override; + MemberType memberType() const override; + QCString memberTypeName() const override; + bool isSignal() const override; + bool isSlot() const override; + bool isVariable() const override; + bool isEnumerate() const override; + bool isEnumValue() const override; + bool isTypedef() const override; + bool isSequence() const override; + bool isDictionary() const override; + bool isFunction() const override; + bool isFunctionPtr() const override; + bool isDefine() const override; + bool isFriend() const override; + bool isDCOP() const override; + bool isProperty() const override; + bool isEvent() const override; + bool isRelated() const override; + bool isForeign() const override; + bool isStatic() const override; + bool isInline() const override; + bool isExplicit() const override; + bool isMutable() const override; + bool isGettable() const override; + bool isPrivateGettable() const override; + bool isProtectedGettable() const override; + bool isSettable() const override; + bool isPrivateSettable() const override; + bool isProtectedSettable() const override; + bool isReadable() const override; + bool isWritable() const override; + bool isAddable() const override; + bool isRemovable() const override; + bool isRaisable() const override; + bool isFinal() const override; + bool isAbstract() const override; + bool isOverride() const override; + bool isInitonly() const override; + bool isOptional() const override; + bool isRequired() const override; + bool isNonAtomic() const override; + bool isCopy() const override; + bool isAssign() const override; + bool isRetain() const override; + bool isWeak() const override; + bool isStrong() const override; + bool isEnumStruct() const override; + bool isUnretained() const override; + bool isNew() const override; + bool isSealed() const override; + bool isImplementation() const override; + bool isExternal() const override; + bool isTypeAlias() const override; + bool isDefault() const override; + bool isDelete() const override; + bool isNoExcept() const override; + bool isAttribute() const override; + bool isUNOProperty() const override; + bool isReadonly() const override; + bool isBound() const override; + bool isConstrained() const override; + bool isTransient() const override; + bool isMaybeVoid() const override; + bool isMaybeDefault() const override; + bool isMaybeAmbiguous() const override; + bool isPublished() const override; + bool isTemplateSpecialization() const override; + bool isObjCMethod() const override; + bool isObjCProperty() const override; + bool isCSharpProperty() const override; + bool isConstructor() const override; + bool isDestructor() const override; + bool hasOneLineInitializer() const override; + bool hasMultiLineInitializer() const override; + bool isCallable() const override; + bool isStrongEnumValue() const override; + bool livesInsideEnum() const override; + bool isSliceLocal() const override; + bool isConstExpr() const override; + int numberOfFlowKeyWords() const override; + bool isFriendToHide() const override; + bool isNotFriend() const override; + bool isFunctionOrSignalSlot() const override; + bool isRelatedOrFriend() const override; + bool isLinkableInProject() const override; + bool isLinkable() const override; + bool hasDocumentation() const override; + bool isDeleted() const override; + bool isBriefSectionVisible() const override; + bool isDetailedSectionVisible(MemberListContainer container) const override; + bool hasDetailedDescription() const override; + bool isFriendClass() const override; + bool isDocumentedFriendClass() const override; + const MemberDef *reimplements() const override; + const MemberVector &reimplementedBy() const override; + bool isReimplementedBy(const ClassDef *cd) const override; + ClassDef *relatedAlso() const override; + bool hasDocumentedEnumValues() const override; + const MemberDef *getAnonymousEnumType() const override; + bool isDocsForDefinition() const override; + const MemberDef *getEnumScope() const override; + const MemberVector &enumFieldList() const override; + void setEnumBaseType(const QCString &type) override; + QCString enumBaseType() const override; + bool hasExamples() const override; + const ExampleList &getExamples() const override; + bool isPrototype() const override; + const ArgumentList &argumentList() const override; + const ArgumentList &declArgumentList() const override; + const ArgumentList &templateArguments() const override; + const ArgumentLists &definitionTemplateParameterLists() const override; + int getMemberGroupId() const override; + MemberGroup *getMemberGroup() const override; + bool fromAnonymousScope() const override; + MemberDef *fromAnonymousMember() const override; + bool hasCallGraph() const override; + bool hasCallerGraph() const override; + bool hasReferencesRelation() const override; + bool hasReferencedByRelation() const override; + bool hasInlineSource() const override; + const MemberDef *templateMaster() const override; + QCString getScopeString() const override; + ClassDef *getClassDefOfAnonymousType() const override; + bool isTypedefValCached() const override; + const ClassDef *getCachedTypedefVal() const override; + QCString getCachedTypedefTemplSpec() const override; + QCString getCachedResolvedTypedef() const override; + MemberDef *memberDefinition() const override; + MemberDef *memberDeclaration() const override; + const MemberDef *inheritsDocsFrom() const override; + const MemberDef *getGroupAlias() const override; + ClassDef *category() const override; + const MemberDef *categoryRelation() const override; + QCString displayName(bool=TRUE) const override; + QCString getDeclType() const override; + StringVector getLabels(const Definition *container) const override; + const ArgumentList &typeConstraints() const override; + QCString requiresClause() const override; + QCString documentation() const override; + QCString briefDescription(bool abbr=FALSE) const override; + QCString fieldType() const override; + bool isReference() const override; + QCString getDeclFileName() const override; + int getDeclLine() const override; + int getDeclColumn() const override; + void setMemberType(MemberType t) override; + void setDefinition(const QCString &d) override; + void setFileDef(FileDef *fd) override; + void setAnchor() override; + void setProtection(Protection p) override; + void setMemberSpecifiers(TypeSpecifier s) override; + void setVhdlSpecifiers(VhdlSpecifier s) override; + void mergeMemberSpecifiers(TypeSpecifier s) override; + void setInitializer(const QCString &i) override; + void setBitfields(const QCString &s) override; + void setMaxInitLines(int lines) override; + void setMemberClass(ClassDef *cd) override; + void setSectionList(const Definition *container,const MemberList *sl) override; + void setGroupDef(const GroupDef *gd,Grouping::GroupPri_t pri, const QCString &fileName,int startLine,bool hasDocs, MemberDef *member=0) override; - virtual void setReadAccessor(const QCString &r) override; - virtual void setWriteAccessor(const QCString &w) override; - virtual void setTemplateSpecialization(bool b) override; - virtual void makeRelated() override; - virtual void makeForeign() override; - virtual void setInheritsDocsFrom(const MemberDef *md) override; - virtual void setTagInfo(const TagInfo *i) override; - virtual void setArgsString(const QCString &as) override; - virtual void setReimplements(MemberDef *md) override; - virtual void insertReimplementedBy(MemberDef *md) override; - virtual void setRelatedAlso(ClassDef *cd) override; - virtual void insertEnumField(MemberDef *md) override; - virtual void setEnumScope(const MemberDef *md,bool livesInsideEnum=FALSE) override; - virtual void setEnumClassScope(ClassDef *cd) override; - virtual void setDocumentedEnumValues(bool value) override; - virtual void setAnonymousEnumType(const MemberDef *md) override; - virtual bool addExample(const QCString &anchor,const QCString &name,const QCString &file) override; - virtual void setPrototype(bool p,const QCString &df,int line, int column) override; - virtual void setExplicitExternal(bool b,const QCString &df,int line,int column) override; - virtual void setDeclFile(const QCString &df,int line,int column) override; - virtual void moveArgumentList(std::unique_ptr al) override; - virtual void moveDeclArgumentList(std::unique_ptr al) override; - virtual void setDefinitionTemplateParameterLists(const ArgumentLists &lists) override; - virtual void setTypeConstraints(const ArgumentList &al) override; - virtual void setType(const QCString &t) override; - virtual void setAccessorType(ClassDef *cd,const QCString &t) override; - virtual void setNamespace(NamespaceDef *nd) override; - virtual void setMemberGroup(MemberGroup *grp) override; - virtual void setMemberGroupId(int id) override; - virtual void makeImplementationDetail() override; - virtual void setFromAnonymousScope(bool b) override; - virtual void setFromAnonymousMember(MemberDef *m) override; - virtual void enableCallGraph(bool e) override; - virtual void mergeEnableCallGraph(bool other) override; - virtual void enableCallerGraph(bool e) override; - virtual void mergeEnableCallerGraph(bool other) override; - virtual void enableReferencedByRelation(bool e) override; - virtual void mergeEnableReferencedByRelation(bool other) override; - virtual void enableReferencesRelation(bool e) override; - virtual void mergeEnableReferencesRelation(bool other) override; - virtual void enableInlineSource(bool e) override; - virtual void mergeEnableInlineSource(bool other) override; - virtual void setTemplateMaster(MemberDef *mt) override; - virtual void addListReference(Definition *d) override; - virtual void setDocsForDefinition(bool b) override; - virtual void setGroupAlias(const MemberDef *md) override; - virtual void cacheTypedefVal(const ClassDef *val,const QCString &templSpec,const QCString &resolvedType) override; - virtual void invalidateTypedefValCache() override; - virtual void invalidateCachedArgumentTypes() override; - virtual void setMemberDefinition(MemberDef *md) override; - virtual void setMemberDeclaration(MemberDef *md) override; - virtual void copyArgumentNames(const MemberDef *bmd) override; - virtual void setCategory(ClassDef *) override; - virtual void setCategoryRelation(const MemberDef *) override; - virtual void setDocumentation(const QCString &d,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE) override; - virtual void setBriefDescription(const QCString &b,const QCString &briefFile,int briefLine) override; - virtual void setInbodyDocumentation(const QCString &d,const QCString &inbodyFile,int inbodyLine) override; - virtual void setHidden(bool b) override; - virtual void setRequiresClause(const QCString &req) override; - virtual void incrementFlowKeyWordCount() override; - virtual void writeDeclaration(OutputList &ol, + void setReadAccessor(const QCString &r) override; + void setWriteAccessor(const QCString &w) override; + void setTemplateSpecialization(bool b) override; + void makeRelated() override; + void makeForeign() override; + void setInheritsDocsFrom(const MemberDef *md) override; + void setTagInfo(const TagInfo *i) override; + void setArgsString(const QCString &as) override; + void setReimplements(MemberDef *md) override; + void insertReimplementedBy(MemberDef *md) override; + void setRelatedAlso(ClassDef *cd) override; + void insertEnumField(MemberDef *md) override; + void setEnumScope(const MemberDef *md,bool livesInsideEnum=FALSE) override; + void setEnumClassScope(ClassDef *cd) override; + void setDocumentedEnumValues(bool value) override; + void setAnonymousEnumType(const MemberDef *md) override; + bool addExample(const QCString &anchor,const QCString &name,const QCString &file) override; + void setPrototype(bool p,const QCString &df,int line, int column) override; + void setExplicitExternal(bool b,const QCString &df,int line,int column) override; + void setDeclFile(const QCString &df,int line,int column) override; + void moveArgumentList(std::unique_ptr al) override; + void moveDeclArgumentList(std::unique_ptr al) override; + void setDefinitionTemplateParameterLists(const ArgumentLists &lists) override; + void setTypeConstraints(const ArgumentList &al) override; + void setType(const QCString &t) override; + void setAccessorType(ClassDef *cd,const QCString &t) override; + void setNamespace(NamespaceDef *nd) override; + void setMemberGroup(MemberGroup *grp) override; + void setMemberGroupId(int id) override; + void makeImplementationDetail() override; + void setFromAnonymousScope(bool b) override; + void setFromAnonymousMember(MemberDef *m) override; + void enableCallGraph(bool e) override; + void mergeEnableCallGraph(bool other) override; + void enableCallerGraph(bool e) override; + void mergeEnableCallerGraph(bool other) override; + void enableReferencedByRelation(bool e) override; + void mergeEnableReferencedByRelation(bool other) override; + void enableReferencesRelation(bool e) override; + void mergeEnableReferencesRelation(bool other) override; + void enableInlineSource(bool e) override; + void mergeEnableInlineSource(bool other) override; + void setTemplateMaster(MemberDef *mt) override; + void addListReference(Definition *d) override; + void setDocsForDefinition(bool b) override; + void setGroupAlias(const MemberDef *md) override; + void cacheTypedefVal(const ClassDef *val,const QCString &templSpec,const QCString &resolvedType) override; + void invalidateTypedefValCache() override; + void invalidateCachedArgumentTypes() override; + void setMemberDefinition(MemberDef *md) override; + void setMemberDeclaration(MemberDef *md) override; + void copyArgumentNames(const MemberDef *bmd) override; + void setCategory(ClassDef *) override; + void setCategoryRelation(const MemberDef *) override; + void setDocumentation(const QCString &d,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE) override; + void setBriefDescription(const QCString &b,const QCString &briefFile,int briefLine) override; + void setInbodyDocumentation(const QCString &d,const QCString &inbodyFile,int inbodyLine) override; + void setHidden(bool b) override; + void setRequiresClause(const QCString &req) override; + void incrementFlowKeyWordCount() override; + void writeDeclaration(OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod, bool inGroup, int indentLevel,const ClassDef *inheritFrom=0,const QCString &inheritId=QCString()) const override; - virtual void writeDocumentation(const MemberList *ml,int memCount,int memTotal,OutputList &ol, + void writeDocumentation(const MemberList *ml,int memCount,int memTotal,OutputList &ol, const QCString &scopeName,const Definition *container, bool inGroup,bool showEnumValues=FALSE,bool showInline=FALSE) const override; - virtual void writeMemberDocSimple(OutputList &ol,const Definition *container) const override; - virtual void writeEnumDeclaration(OutputList &typeDecl, + void writeMemberDocSimple(OutputList &ol,const Definition *container) const override; + void writeEnumDeclaration(OutputList &typeDecl, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod) const override; - virtual void writeTagFile(TextStream &,bool useQualifiedName,bool showNamespaceMembers) const override; - virtual void warnIfUndocumented() const override; - virtual void warnIfUndocumentedParams() const override; - virtual bool visibleInIndex() const override; - virtual void detectUndocumentedParams(bool hasParamCommand,bool hasReturnCommand) const override; - virtual std::unique_ptr createTemplateInstanceMember(const ArgumentList &formalArgs, + void writeTagFile(TextStream &,bool useQualifiedName,bool showNamespaceMembers) const override; + void warnIfUndocumented() const override; + void warnIfUndocumentedParams() const override; + bool visibleInIndex() const override; + void detectUndocumentedParams(bool hasParamCommand,bool hasReturnCommand) const override; + std::unique_ptr createTemplateInstanceMember(const ArgumentList &formalArgs, const std::unique_ptr &actualArgs) const override; - virtual void findSectionsInDocumentation() override; - virtual void writeLink(OutputList &ol, + void findSectionsInDocumentation() override; + void writeLink(OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod, bool onlyText=FALSE) const override; - virtual void resolveUnnamedParameters(const MemberDef *md) override; - virtual void addQualifiers(const StringVector &qualifiers) override; - virtual StringVector getQualifiers() const override; - virtual ClassDefMutable *getClassDefMutable() override; - virtual void setModuleDef(ModuleDef *mod) override; + void resolveUnnamedParameters(const MemberDef *md) override; + void addQualifiers(const StringVector &qualifiers) override; + StringVector getQualifiers() const override; + ClassDefMutable *getClassDefMutable() override; + void setModuleDef(ModuleDef *mod) override; private: void _computeLinkableInProject(); @@ -525,413 +525,413 @@ class MemberDefAliasImpl : public DefinitionAliasMixin public: MemberDefAliasImpl(const Definition *newScope,const MemberDef *md) : DefinitionAliasMixin(newScope,md), m_memberGroup(0) { init(); } - virtual ~MemberDefAliasImpl() { deinit(); } - virtual DefType definitionType() const { return TypeMember; } + ~MemberDefAliasImpl() { deinit(); } + DefType definitionType() const override { return TypeMember; } const MemberDef *getMdAlias() const { return toMemberDef(getAlias()); } MemberDef *getMdAlias() { return toMemberDef(const_cast(getAlias())); } - virtual MemberDef *resolveAlias() { return const_cast(getMdAlias()); } - virtual const MemberDef *resolveAlias() const { return getMdAlias(); } + MemberDef *resolveAlias() { return const_cast(getMdAlias()); } + const MemberDef *resolveAlias() const { return getMdAlias(); } - virtual std::unique_ptr deepCopy() const { + std::unique_ptr deepCopy() const override { return createMemberDefAlias(getScope(),getMdAlias()); } - virtual void moveTo(Definition *) {} + void moveTo(Definition *) override {} - virtual const QCString &name() const + const QCString &name() const override { return getMdAlias()->name(); } - virtual CodeSymbolType codeSymbolType() const + CodeSymbolType codeSymbolType() const override { return getMdAlias()->codeSymbolType(); } - virtual QCString getOutputFileBase() const + QCString getOutputFileBase() const override { return getMdAlias()->getOutputFileBase(); } - virtual QCString getReference() const + QCString getReference() const override { return getMdAlias()->getReference(); } - virtual QCString anchor() const + QCString anchor() const override { return getMdAlias()->anchor(); } - virtual QCString declaration() const + QCString declaration() const override { return getMdAlias()->declaration(); } - virtual QCString definition() const + QCString definition() const override { return getMdAlias()->definition(); } - virtual QCString typeString() const + QCString typeString() const override { return getMdAlias()->typeString(); } - virtual QCString argsString() const + QCString argsString() const override { return getMdAlias()->argsString(); } - virtual QCString excpString() const + QCString excpString() const override { return getMdAlias()->excpString(); } - virtual QCString bitfieldString() const + QCString bitfieldString() const override { return getMdAlias()->bitfieldString(); } - virtual QCString extraTypeChars() const + QCString extraTypeChars() const override { return getMdAlias()->extraTypeChars(); } - virtual const QCString &initializer() const + const QCString &initializer() const override { return getMdAlias()->initializer(); } - virtual int initializerLines() const + int initializerLines() const override { return getMdAlias()->initializerLines(); } - virtual TypeSpecifier getMemberSpecifiers() const + TypeSpecifier getMemberSpecifiers() const override { return getMdAlias()->getMemberSpecifiers(); } - virtual VhdlSpecifier getVhdlSpecifiers() const + VhdlSpecifier getVhdlSpecifiers() const override { return getMdAlias()->getVhdlSpecifiers(); } - virtual const MemberList *getSectionList(const Definition *container) const + const MemberList *getSectionList(const Definition *container) const override { return getMdAlias()->getSectionList(container); } - virtual QCString displayDefinition() const + QCString displayDefinition() const override { return getMdAlias()->displayDefinition(); } - virtual const ClassDef *getClassDef() const + const ClassDef *getClassDef() const override { return getMdAlias()->getClassDef(); } - virtual ClassDef *getClassDef() + ClassDef *getClassDef() override { return getMdAlias()->getClassDef(); } - virtual const FileDef *getFileDef() const + const FileDef *getFileDef() const override { return getMdAlias()->getFileDef(); } - virtual FileDef *getFileDef() + FileDef *getFileDef() override { return getMdAlias()->getFileDef(); } - virtual const ModuleDef *getModuleDef() const + const ModuleDef *getModuleDef() const override { return getMdAlias()->getModuleDef(); } - virtual const NamespaceDef* getNamespaceDef() const + const NamespaceDef* getNamespaceDef() const override { return getMdAlias()->getNamespaceDef(); } - virtual NamespaceDef* getNamespaceDef() + NamespaceDef* getNamespaceDef() override { return getMdAlias()->getNamespaceDef(); } - virtual const ClassDef *accessorClass() const + const ClassDef *accessorClass() const override { return getMdAlias()->accessorClass(); } - virtual QCString getReadAccessor() const + QCString getReadAccessor() const override { return getMdAlias()->getReadAccessor(); } - virtual QCString getWriteAccessor() const + QCString getWriteAccessor() const override { return getMdAlias()->getWriteAccessor(); } - virtual const GroupDef *getGroupDef() const + const GroupDef *getGroupDef() const override { return getMdAlias()->getGroupDef(); } - virtual Grouping::GroupPri_t getGroupPri() const + Grouping::GroupPri_t getGroupPri() const override { return getMdAlias()->getGroupPri(); } - virtual QCString getGroupFileName() const + QCString getGroupFileName() const override { return getMdAlias()->getGroupFileName(); } - virtual int getGroupStartLine() const + int getGroupStartLine() const override { return getMdAlias()->getGroupStartLine(); } - virtual bool getGroupHasDocs() const + bool getGroupHasDocs() const override { return getMdAlias()->getGroupHasDocs(); } - virtual QCString qualifiedName() const + QCString qualifiedName() const override { return getMdAlias()->qualifiedName(); } - virtual QCString objCMethodName(bool localLink,bool showStatic) const + QCString objCMethodName(bool localLink,bool showStatic) const override { return getMdAlias()->objCMethodName(localLink,showStatic); } - virtual Protection protection() const + Protection protection() const override { return getMdAlias()->protection(); } - virtual Specifier virtualness(int /* count */) const + Specifier virtualness(int /* count */) const override { return getMdAlias()->virtualness(); } - virtual MemberType memberType() const + MemberType memberType() const override { return getMdAlias()->memberType(); } - virtual QCString memberTypeName() const + QCString memberTypeName() const override { return getMdAlias()->memberTypeName(); } - virtual bool isSignal() const + bool isSignal() const override { return getMdAlias()->isSignal(); } - virtual bool isSlot() const + bool isSlot() const override { return getMdAlias()->isSlot(); } - virtual bool isVariable() const + bool isVariable() const override { return getMdAlias()->isVariable(); } - virtual bool isEnumerate() const + bool isEnumerate() const override { return getMdAlias()->isEnumerate(); } - virtual bool isEnumValue() const + bool isEnumValue() const override { return getMdAlias()->isEnumValue(); } - virtual bool isTypedef() const + bool isTypedef() const override { return getMdAlias()->isTypedef(); } - virtual bool isSequence() const + bool isSequence() const override { return getMdAlias()->isSequence(); } - virtual bool isDictionary() const + bool isDictionary() const override { return getMdAlias()->isDictionary(); } - virtual bool isFunction() const + bool isFunction() const override { return getMdAlias()->isFunction(); } - virtual bool isFunctionPtr() const + bool isFunctionPtr() const override { return getMdAlias()->isFunctionPtr(); } - virtual bool isDefine() const + bool isDefine() const override { return getMdAlias()->isDefine(); } - virtual bool isFriend() const + bool isFriend() const override { return getMdAlias()->isFriend(); } - virtual bool isDCOP() const + bool isDCOP() const override { return getMdAlias()->isDCOP(); } - virtual bool isProperty() const + bool isProperty() const override { return getMdAlias()->isProperty(); } - virtual bool isEvent() const + bool isEvent() const override { return getMdAlias()->isEvent(); } - virtual bool isRelated() const + bool isRelated() const override { return getMdAlias()->isRelated(); } - virtual bool isForeign() const + bool isForeign() const override { return getMdAlias()->isForeign(); } - virtual bool isStatic() const + bool isStatic() const override { return getMdAlias()->isStatic(); } - virtual bool isInline() const + bool isInline() const override { return getMdAlias()->isInline(); } - virtual bool isExplicit() const + bool isExplicit() const override { return getMdAlias()->isExplicit(); } - virtual bool isMutable() const + bool isMutable() const override { return getMdAlias()->isMutable(); } - virtual bool isGettable() const + bool isGettable() const override { return getMdAlias()->isGettable(); } - virtual bool isPrivateGettable() const + bool isPrivateGettable() const override { return getMdAlias()->isPrivateGettable(); } - virtual bool isProtectedGettable() const + bool isProtectedGettable() const override { return getMdAlias()->isProtectedGettable(); } - virtual bool isSettable() const + bool isSettable() const override { return getMdAlias()->isSettable(); } - virtual bool isPrivateSettable() const + bool isPrivateSettable() const override { return getMdAlias()->isPrivateSettable(); } - virtual bool isProtectedSettable() const + bool isProtectedSettable() const override { return getMdAlias()->isProtectedSettable(); } - virtual bool isReadable() const + bool isReadable() const override { return getMdAlias()->isReadable(); } - virtual bool isWritable() const + bool isWritable() const override { return getMdAlias()->isWritable(); } - virtual bool isAddable() const + bool isAddable() const override { return getMdAlias()->isAddable(); } - virtual bool isRemovable() const + bool isRemovable() const override { return getMdAlias()->isRemovable(); } - virtual bool isRaisable() const + bool isRaisable() const override { return getMdAlias()->isRaisable(); } - virtual bool isFinal() const + bool isFinal() const override { return getMdAlias()->isFinal(); } - virtual bool isAbstract() const + bool isAbstract() const override { return getMdAlias()->isAbstract(); } - virtual bool isOverride() const + bool isOverride() const override { return getMdAlias()->isOverride(); } - virtual bool isInitonly() const + bool isInitonly() const override { return getMdAlias()->isInitonly(); } - virtual bool isOptional() const + bool isOptional() const override { return getMdAlias()->isOptional(); } - virtual bool isRequired() const + bool isRequired() const override { return getMdAlias()->isRequired(); } - virtual bool isNonAtomic() const + bool isNonAtomic() const override { return getMdAlias()->isNonAtomic(); } - virtual bool isCopy() const + bool isCopy() const override { return getMdAlias()->isCopy(); } - virtual bool isAssign() const + bool isAssign() const override { return getMdAlias()->isAssign(); } - virtual bool isRetain() const + bool isRetain() const override { return getMdAlias()->isRetain(); } - virtual bool isWeak() const + bool isWeak() const override { return getMdAlias()->isWeak(); } - virtual bool isStrong() const + bool isStrong() const override { return getMdAlias()->isStrong(); } - virtual bool isEnumStruct() const + bool isEnumStruct() const override { return getMdAlias()->isEnumStruct(); } - virtual bool isUnretained() const + bool isUnretained() const override { return getMdAlias()->isUnretained(); } - virtual bool isNew() const + bool isNew() const override { return getMdAlias()->isNew(); } - virtual bool isSealed() const + bool isSealed() const override { return getMdAlias()->isSealed(); } - virtual bool isImplementation() const + bool isImplementation() const override { return getMdAlias()->isImplementation(); } - virtual bool isExternal() const + bool isExternal() const override { return getMdAlias()->isExternal(); } - virtual bool isTypeAlias() const + bool isTypeAlias() const override { return getMdAlias()->isTypeAlias(); } - virtual bool isDefault() const + bool isDefault() const override { return getMdAlias()->isDefault(); } - virtual bool isDelete() const + bool isDelete() const override { return getMdAlias()->isDelete(); } - virtual bool isNoExcept() const + bool isNoExcept() const override { return getMdAlias()->isNoExcept(); } - virtual bool isAttribute() const + bool isAttribute() const override { return getMdAlias()->isAttribute(); } - virtual bool isUNOProperty() const + bool isUNOProperty() const override { return getMdAlias()->isUNOProperty(); } - virtual bool isReadonly() const + bool isReadonly() const override { return getMdAlias()->isReadable(); } - virtual bool isBound() const + bool isBound() const override { return getMdAlias()->isBound(); } - virtual bool isConstrained() const + bool isConstrained() const override { return getMdAlias()->isConstrained(); } - virtual bool isTransient() const + bool isTransient() const override { return getMdAlias()->isTransient(); } - virtual bool isMaybeVoid() const + bool isMaybeVoid() const override { return getMdAlias()->isMaybeVoid(); } - virtual bool isMaybeDefault() const + bool isMaybeDefault() const override { return getMdAlias()->isMaybeDefault(); } - virtual bool isMaybeAmbiguous() const + bool isMaybeAmbiguous() const override { return getMdAlias()->isMaybeAmbiguous(); } - virtual bool isPublished() const + bool isPublished() const override { return getMdAlias()->isPublished(); } - virtual bool isTemplateSpecialization() const + bool isTemplateSpecialization() const override { return getMdAlias()->isTemplateSpecialization(); } - virtual bool isObjCMethod() const + bool isObjCMethod() const override { return getMdAlias()->isObjCMethod(); } - virtual bool isObjCProperty() const + bool isObjCProperty() const override { return getMdAlias()->isObjCProperty(); } - virtual bool isCSharpProperty() const + bool isCSharpProperty() const override { return getMdAlias()->isCSharpProperty(); } - virtual bool isConstructor() const + bool isConstructor() const override { return getMdAlias()->isConstructor(); } - virtual bool isDestructor() const + bool isDestructor() const override { return getMdAlias()->isDestructor(); } - virtual bool hasOneLineInitializer() const + bool hasOneLineInitializer() const override { return getMdAlias()->hasOneLineInitializer(); } - virtual bool hasMultiLineInitializer() const + bool hasMultiLineInitializer() const override { return getMdAlias()->hasMultiLineInitializer(); } - virtual bool isCallable() const + bool isCallable() const override { return getMdAlias()->isCallable(); } - virtual bool isStrongEnumValue() const + bool isStrongEnumValue() const override { return getMdAlias()->isStrongEnumValue(); } - virtual bool livesInsideEnum() const + bool livesInsideEnum() const override { return getMdAlias()->livesInsideEnum(); } - virtual bool isSliceLocal() const + bool isSliceLocal() const override { return getMdAlias()->isSliceLocal(); } - virtual bool isConstExpr() const + bool isConstExpr() const override { return getMdAlias()->isConstExpr(); } - virtual int numberOfFlowKeyWords() const + int numberOfFlowKeyWords() const override { return getMdAlias()->numberOfFlowKeyWords(); } - virtual bool isFriendToHide() const + bool isFriendToHide() const override { return getMdAlias()->isFriendToHide(); } - virtual bool isNotFriend() const + bool isNotFriend() const override { return getMdAlias()->isNotFriend(); } - virtual bool isFunctionOrSignalSlot() const + bool isFunctionOrSignalSlot() const override { return getMdAlias()->isFunctionOrSignalSlot(); } - virtual bool isRelatedOrFriend() const + bool isRelatedOrFriend() const override { return getMdAlias()->isRelatedOrFriend(); } - virtual bool isLinkableInProject() const + bool isLinkableInProject() const override { return getMdAlias()->isLinkableInProject(); } - virtual bool isLinkable() const + bool isLinkable() const override { return getMdAlias()->isLinkable(); } - virtual bool hasDocumentation() const + bool hasDocumentation() const override { return getMdAlias()->hasDocumentation(); } - virtual bool isDeleted() const + bool isDeleted() const override { return getMdAlias()->isDeleted(); } - virtual bool isBriefSectionVisible() const + bool isBriefSectionVisible() const override { return getMdAlias()->isBriefSectionVisible(); } - virtual bool isDetailedSectionVisible(MemberListContainer container) const + bool isDetailedSectionVisible(MemberListContainer container) const override { return getMdAlias()->isDetailedSectionVisible(container); } - virtual bool hasDetailedDescription() const + bool hasDetailedDescription() const override { return getMdAlias()->hasDetailedDescription(); } - virtual bool isFriendClass() const + bool isFriendClass() const override { return getMdAlias()->isFriendClass(); } - virtual bool isDocumentedFriendClass() const + bool isDocumentedFriendClass() const override { return getMdAlias()->isDocumentedFriendClass(); } - virtual const MemberDef *reimplements() const + const MemberDef *reimplements() const override { return getMdAlias()->reimplements(); } - virtual const MemberVector &reimplementedBy() const + const MemberVector &reimplementedBy() const override { return getMdAlias()->reimplementedBy(); } - virtual bool isReimplementedBy(const ClassDef *cd) const + bool isReimplementedBy(const ClassDef *cd) const override { return getMdAlias()->isReimplementedBy(cd); } - virtual ClassDef *relatedAlso() const + ClassDef *relatedAlso() const override { return getMdAlias()->relatedAlso(); } - virtual bool hasDocumentedEnumValues() const + bool hasDocumentedEnumValues() const override { return getMdAlias()->hasDocumentedEnumValues(); } - virtual const MemberDef *getAnonymousEnumType() const + const MemberDef *getAnonymousEnumType() const override { return getMdAlias()->getAnonymousEnumType(); } - virtual bool isDocsForDefinition() const + bool isDocsForDefinition() const override { return getMdAlias()->isDocsForDefinition(); } - virtual const MemberDef *getEnumScope() const + const MemberDef *getEnumScope() const override { return getMdAlias()->getEnumScope(); } - virtual const MemberVector &enumFieldList() const + const MemberVector &enumFieldList() const override { return getMdAlias()->enumFieldList(); } - virtual QCString enumBaseType() const + QCString enumBaseType() const override { return getMdAlias()->enumBaseType(); } - virtual bool hasExamples() const + bool hasExamples() const override { return getMdAlias()->hasExamples(); } - virtual const ExampleList &getExamples() const + const ExampleList &getExamples() const override { return getMdAlias()->getExamples(); } - virtual bool isPrototype() const + bool isPrototype() const override { return getMdAlias()->isPrototype(); } - virtual const ArgumentList &argumentList() const + const ArgumentList &argumentList() const override { return getMdAlias()->argumentList(); } - virtual const ArgumentList &declArgumentList() const + const ArgumentList &declArgumentList() const override { return getMdAlias()->declArgumentList(); } - virtual const ArgumentList &templateArguments() const + const ArgumentList &templateArguments() const override { return getMdAlias()->templateArguments(); } - virtual const ArgumentLists &definitionTemplateParameterLists() const + const ArgumentLists &definitionTemplateParameterLists() const override { return getMdAlias()->definitionTemplateParameterLists(); } - virtual int getMemberGroupId() const + int getMemberGroupId() const override { return getMdAlias()->getMemberGroupId(); } - virtual MemberGroup *getMemberGroup() const + MemberGroup *getMemberGroup() const override { return m_memberGroup; } - virtual bool fromAnonymousScope() const + bool fromAnonymousScope() const override { return getMdAlias()->fromAnonymousScope(); } - virtual MemberDef *fromAnonymousMember() const + MemberDef *fromAnonymousMember() const override { return getMdAlias()->fromAnonymousMember(); } - virtual bool hasCallGraph() const + bool hasCallGraph() const override { return getMdAlias()->hasCallGraph(); } - virtual bool hasCallerGraph() const + bool hasCallerGraph() const override { return getMdAlias()->hasCallerGraph(); } - virtual bool hasReferencesRelation() const + bool hasReferencesRelation() const override { return getMdAlias()->hasReferencesRelation(); } - virtual bool hasReferencedByRelation() const + bool hasReferencedByRelation() const override { return getMdAlias()->hasReferencedByRelation(); } - virtual bool hasInlineSource() const + bool hasInlineSource() const override { return getMdAlias()->hasInlineSource(); } - virtual StringVector getQualifiers() const + StringVector getQualifiers() const override { return getMdAlias()->getQualifiers(); } - virtual const MemberDef *templateMaster() const + const MemberDef *templateMaster() const override { return getMdAlias()->templateMaster(); } - virtual QCString getScopeString() const + QCString getScopeString() const override { return getMdAlias()->getScopeString(); } - virtual ClassDef *getClassDefOfAnonymousType() const + ClassDef *getClassDefOfAnonymousType() const override { return getMdAlias()->getClassDefOfAnonymousType(); } - virtual bool isTypedefValCached() const + bool isTypedefValCached() const override { return getMdAlias()->isTypedefValCached(); } - virtual const ClassDef *getCachedTypedefVal() const + const ClassDef *getCachedTypedefVal() const override { return getMdAlias()->getCachedTypedefVal(); } - virtual QCString getCachedTypedefTemplSpec() const + QCString getCachedTypedefTemplSpec() const override { return getMdAlias()->getCachedTypedefTemplSpec(); } - virtual QCString getCachedResolvedTypedef() const + QCString getCachedResolvedTypedef() const override { return getMdAlias()->getCachedResolvedTypedef(); } - virtual MemberDef *memberDefinition() const + MemberDef *memberDefinition() const override { return getMdAlias()->memberDefinition(); } - virtual MemberDef *memberDeclaration() const + MemberDef *memberDeclaration() const override { return getMdAlias()->memberDeclaration(); } - virtual const MemberDef *inheritsDocsFrom() const + const MemberDef *inheritsDocsFrom() const override { return getMdAlias()->inheritsDocsFrom(); } - virtual const MemberDef *getGroupAlias() const + const MemberDef *getGroupAlias() const override { return getMdAlias()->getGroupAlias(); } - virtual ClassDef *category() const + ClassDef *category() const override { return getMdAlias()->category(); } - virtual const MemberDef *categoryRelation() const + const MemberDef *categoryRelation() const override { return getMdAlias()->categoryRelation(); } - virtual QCString displayName(bool b=TRUE) const + QCString displayName(bool b=TRUE) const override { return getMdAlias()->displayName(b); } - virtual QCString getDeclType() const + QCString getDeclType() const override { return getMdAlias()->getDeclType(); } - virtual StringVector getLabels(const Definition *container) const + StringVector getLabels(const Definition *container) const override { return getMdAlias()->getLabels(container); } - virtual const ArgumentList &typeConstraints() const + const ArgumentList &typeConstraints() const override { return getMdAlias()->typeConstraints(); } - virtual QCString documentation() const + QCString documentation() const override { return getMdAlias()->documentation(); } - virtual QCString briefDescription(bool /* abbr=FALSE */) const + QCString briefDescription(bool /* abbr=FALSE */) const override { return getMdAlias()->briefDescription(); } - virtual QCString fieldType() const + QCString fieldType() const override { return getMdAlias()->fieldType(); } - virtual bool isReference() const + bool isReference() const override { return getMdAlias()->isReference(); } - virtual QCString getDeclFileName() const + QCString getDeclFileName() const override { return getMdAlias()->getDeclFileName(); } - virtual int getDeclLine() const + int getDeclLine() const override { return getMdAlias()->getDeclLine(); } - virtual int getDeclColumn() const + int getDeclColumn() const override { return getMdAlias()->getDeclColumn(); } - virtual QCString requiresClause() const + QCString requiresClause() const override { return getMdAlias()->requiresClause(); } - virtual bool visibleInIndex() const + bool visibleInIndex() const override { return getMdAlias()->visibleInIndex(); } - virtual void warnIfUndocumented() const {} - virtual void warnIfUndocumentedParams() const {} - virtual void detectUndocumentedParams(bool /* hasParamCommand */,bool /* hasReturnCommand */) const {} - virtual void setMemberGroup(MemberGroup *grp) { m_memberGroup = grp; } - virtual std::unique_ptr createTemplateInstanceMember(const ArgumentList &formalArgs, - const std::unique_ptr &actualArgs) const + void warnIfUndocumented() const override {} + void warnIfUndocumentedParams() const override {} + void detectUndocumentedParams(bool /* hasParamCommand */,bool /* hasReturnCommand */) const override {} + void setMemberGroup(MemberGroup *grp) override { m_memberGroup = grp; } + std::unique_ptr createTemplateInstanceMember(const ArgumentList &formalArgs, + const std::unique_ptr &actualArgs) const override { return getMdAlias()->createTemplateInstanceMember(formalArgs,actualArgs); } - virtual void writeDeclaration(OutputList &ol, + void writeDeclaration(OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod, - bool inGroup, int indentLevel, const ClassDef *inheritFrom=0,const QCString &inheritId=QCString()) const + bool inGroup, int indentLevel, const ClassDef *inheritFrom=0,const QCString &inheritId=QCString()) const override { getMdAlias()->writeDeclaration(ol,cd,nd,fd,gd,mod,inGroup,indentLevel,inheritFrom,inheritId); } - virtual void writeEnumDeclaration(OutputList &typeDecl, - const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod) const + void writeEnumDeclaration(OutputList &typeDecl, + const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod) const override { getMdAlias()->writeEnumDeclaration(typeDecl,cd,nd,fd,gd,mod); } - virtual void writeLink(OutputList &ol, + void writeLink(OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,const ModuleDef *mod, - bool onlyText=FALSE) const + bool onlyText=FALSE) const override { getMdAlias()->writeLink(ol,cd,nd,fd,gd,mod,onlyText); } diff --git a/src/moduledef.cpp b/src/moduledef.cpp index e6092e7eaf3..830a66e208b 100644 --- a/src/moduledef.cpp +++ b/src/moduledef.cpp @@ -54,33 +54,33 @@ class ModuleDefImpl : public DefinitionMixin m_type(type), m_partitionName(partitionName) {} // --- Definition - virtual DefType definitionType() const override { return TypeModule; } - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Module; } - virtual QCString displayName(bool=TRUE) const override { return name(); } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return ""; } - virtual bool isLinkableInProject() const override { return isLinkable() && !isHidden() && !isReference(); } - virtual bool isLinkable() const override { return hasDocumentation(); } - virtual QCString qualifiedName() const override; - virtual void writeSummaryLinks(OutputList &ol) const override; + DefType definitionType() const override { return TypeModule; } + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Module; } + QCString displayName(bool=TRUE) const override { return name(); } + QCString getOutputFileBase() const override; + QCString anchor() const override { return ""; } + bool isLinkableInProject() const override { return isLinkable() && !isHidden() && !isReference(); } + bool isLinkable() const override { return hasDocumentation(); } + QCString qualifiedName() const override; + void writeSummaryLinks(OutputList &ol) const override; // --- ModuleDef - virtual Type moduleType() const override { return m_type; } - virtual QCString partitionName() const override { return m_partitionName; } - virtual void writeDocumentation(OutputList &ol) override; - virtual bool isPrimaryInterface() const override { return m_type==Type::Interface && m_partitionName.isEmpty(); } - virtual MemberList *getMemberList(MemberListType lt) const override; - virtual const MemberLists &getMemberLists() const override { return m_memberLists; } - virtual const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } - virtual const ClassLinkedRefMap &getClasses() const override { return m_classes; } - virtual const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } - virtual int countVisibleMembers() const override; - virtual FileDef *getFileDef() const override { return m_fileDef; } - virtual const ImportInfoMap &getImports() const override { return m_imports; } - virtual const ImportInfoMap &getExports() const override { return m_exportedModules; } - virtual const ModuleMap &partitions() const override { return m_partitions; } - virtual void writeTagFile(TextStream &t) const override; - virtual FileList getUsedFiles() const override; + Type moduleType() const override { return m_type; } + QCString partitionName() const override { return m_partitionName; } + void writeDocumentation(OutputList &ol) override; + bool isPrimaryInterface() const override { return m_type==Type::Interface && m_partitionName.isEmpty(); } + MemberList *getMemberList(MemberListType lt) const override; + const MemberLists &getMemberLists() const override { return m_memberLists; } + const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } + const ClassLinkedRefMap &getClasses() const override { return m_classes; } + const ConceptLinkedRefMap &getConcepts() const override { return m_concepts; } + int countVisibleMembers() const override; + FileDef *getFileDef() const override { return m_fileDef; } + const ImportInfoMap &getImports() const override { return m_imports; } + const ImportInfoMap &getExports() const override { return m_exportedModules; } + const ModuleMap &partitions() const override { return m_partitions; } + void writeTagFile(TextStream &t) const override; + FileList getUsedFiles() const override; void writeExports(OutputList &ol,const QCString &title); void writeClassDeclarations(OutputList &ol,const QCString &title); diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 2bf7c83fd98..62791ac7dd5 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -57,65 +57,65 @@ class NamespaceDefImpl : public DefinitionMixin const QCString &refFile=QCString(),const QCString &type=QCString(), bool isPublished=false); virtual ~NamespaceDefImpl(); - virtual DefType definitionType() const override { return TypeNamespace; } - virtual CodeSymbolType codeSymbolType() const override + DefType definitionType() const override { return TypeNamespace; } + CodeSymbolType codeSymbolType() const override { return getLanguage()==SrcLangExt_Java ? CodeSymbolType::Package : CodeSymbolType::Namespace; } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return QCString(); } - virtual void insertUsedFile(FileDef *fd) override; - virtual void writeDocumentation(OutputList &ol) override; - virtual void writeMemberPages(OutputList &ol) override; - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; - virtual void writeTagFile(TextStream &) override; - virtual void insertClass(ClassDef *cd) override; - virtual void insertConcept(ConceptDef *cd) override; - virtual void insertNamespace(NamespaceDef *nd) override; - virtual void insertMember(MemberDef *md) override; - virtual void computeAnchors() override; - virtual void countMembers() override; - virtual int numDocMembers() const override; - virtual void addUsingDirective(NamespaceDef *nd) override; - virtual const LinkedRefMap &getUsedNamespaces() const override { return m_usingDirList; } - virtual void addUsingDeclaration(ClassDef *cd) override; - virtual const LinkedRefMap &getUsedClasses() const override { return m_usingDeclList; } - virtual void combineUsingRelations(NamespaceDefSet &visitedNamespace) override; - virtual QCString displayName(bool=TRUE) const override; - virtual void setInline(bool isInline) override { m_inline = isInline; } - virtual bool isConstantGroup() const override { return CONSTANT_GROUP == m_type; } - virtual bool isModule() const override { return NAMESPACE == m_type || MODULE == m_type; } - virtual bool isLibrary() const override { return LIBRARY == m_type; } - virtual bool isInline() const override { return m_inline; } - virtual bool isLinkableInProject() const override; - virtual bool isLinkable() const override; - virtual bool isVisibleInHierarchy() const override; - virtual bool hasDetailedDescription() const override; - virtual void addMembersToMemberGroup() override; - virtual void distributeMemberGroupDocumentation() override; - virtual void findSectionsInDocumentation() override; - virtual void sortMemberLists() override; - virtual const Definition *findInnerCompound(const QCString &name) const override; - virtual void addInnerCompound(Definition *d) override; - virtual void addListReferences() override; - virtual void setFileName(const QCString &fn) override; - virtual bool subGrouping() const override { return m_subGrouping; } - virtual MemberList *getMemberList(MemberListType lt) const override; - virtual const MemberLists &getMemberLists() const override { return m_memberLists; } - virtual const MemberDef *getMemberByName(const QCString &) const override; - virtual const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } - virtual ClassLinkedRefMap getClasses() const override { return classes; } - virtual ClassLinkedRefMap getInterfaces() const override { return interfaces; } - virtual ClassLinkedRefMap getStructs() const override { return structs; } - virtual ClassLinkedRefMap getExceptions() const override { return exceptions; } - virtual NamespaceLinkedRefMap getNamespaces() const override { return namespaces; } - virtual ConceptLinkedRefMap getConcepts() const override { return m_concepts; } - virtual void setName(const QCString &name) override; - - virtual QCString title() const override; - virtual QCString compoundTypeString() const override; - - virtual void setMetaData(const QCString &m) override; - virtual int countVisibleMembers() const override; - virtual void writeSummaryLinks(OutputList &ol) const override; + QCString getOutputFileBase() const override; + QCString anchor() const override { return QCString(); } + void insertUsedFile(FileDef *fd) override; + void writeDocumentation(OutputList &ol) override; + void writeMemberPages(OutputList &ol) override; + void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const override; + void writeTagFile(TextStream &) override; + void insertClass(ClassDef *cd) override; + void insertConcept(ConceptDef *cd) override; + void insertNamespace(NamespaceDef *nd) override; + void insertMember(MemberDef *md) override; + void computeAnchors() override; + void countMembers() override; + int numDocMembers() const override; + void addUsingDirective(NamespaceDef *nd) override; + const LinkedRefMap &getUsedNamespaces() const override { return m_usingDirList; } + void addUsingDeclaration(ClassDef *cd) override; + const LinkedRefMap &getUsedClasses() const override { return m_usingDeclList; } + void combineUsingRelations(NamespaceDefSet &visitedNamespace) override; + QCString displayName(bool=TRUE) const override; + void setInline(bool isInline) override { m_inline = isInline; } + bool isConstantGroup() const override { return CONSTANT_GROUP == m_type; } + bool isModule() const override { return NAMESPACE == m_type || MODULE == m_type; } + bool isLibrary() const override { return LIBRARY == m_type; } + bool isInline() const override { return m_inline; } + bool isLinkableInProject() const override; + bool isLinkable() const override; + bool isVisibleInHierarchy() const override; + bool hasDetailedDescription() const override; + void addMembersToMemberGroup() override; + void distributeMemberGroupDocumentation() override; + void findSectionsInDocumentation() override; + void sortMemberLists() override; + const Definition *findInnerCompound(const QCString &name) const override; + void addInnerCompound(Definition *d) override; + void addListReferences() override; + void setFileName(const QCString &fn) override; + bool subGrouping() const override { return m_subGrouping; } + MemberList *getMemberList(MemberListType lt) const override; + const MemberLists &getMemberLists() const override { return m_memberLists; } + const MemberDef *getMemberByName(const QCString &) const override; + const MemberGroupList &getMemberGroups() const override { return m_memberGroups; } + ClassLinkedRefMap getClasses() const override { return classes; } + ClassLinkedRefMap getInterfaces() const override { return interfaces; } + ClassLinkedRefMap getStructs() const override { return structs; } + ClassLinkedRefMap getExceptions() const override { return exceptions; } + NamespaceLinkedRefMap getNamespaces() const override { return namespaces; } + ConceptLinkedRefMap getConcepts() const override { return m_concepts; } + void setName(const QCString &name) override; + + QCString title() const override; + QCString compoundTypeString() const override; + + void setMetaData(const QCString &m) override; + int countVisibleMembers() const override; + void writeSummaryLinks(OutputList &ol) const override; private: void addMemberToList(MemberListType lt,MemberDef *md); @@ -180,73 +180,73 @@ class NamespaceDefAliasImpl : public DefinitionAliasMixin public: NamespaceDefAliasImpl(const Definition *newScope,const NamespaceDef *nd) : DefinitionAliasMixin(newScope,nd) { init(); } - virtual ~NamespaceDefAliasImpl() { deinit(); } - virtual DefType definitionType() const { return TypeNamespace; } + ~NamespaceDefAliasImpl() { deinit(); } + DefType definitionType() const override { return TypeNamespace; } const NamespaceDef *getNSAlias() const { return toNamespaceDef(getAlias()); } // ---- getters - virtual CodeSymbolType codeSymbolType() const + CodeSymbolType codeSymbolType() const override { return getNSAlias()->codeSymbolType(); } - virtual QCString getOutputFileBase() const + QCString getOutputFileBase() const override { return getNSAlias()->getOutputFileBase(); } - virtual QCString anchor() const + QCString anchor() const override { return getNSAlias()->anchor(); } - virtual int numDocMembers() const + int numDocMembers() const override { return getNSAlias()->numDocMembers(); } - virtual const LinkedRefMap &getUsedNamespaces() const + const LinkedRefMap &getUsedNamespaces() const override { return getNSAlias()->getUsedNamespaces(); } - virtual const LinkedRefMap &getUsedClasses() const + const LinkedRefMap &getUsedClasses() const override { return getNSAlias()->getUsedClasses(); } - virtual QCString displayName(bool b=TRUE) const + QCString displayName(bool b=TRUE) const override { return makeDisplayName(this,b); } - virtual const QCString &localName() const + const QCString &localName() const override { return getNSAlias()->localName(); } - virtual bool isConstantGroup() const + bool isConstantGroup() const override { return getNSAlias()->isConstantGroup(); } - virtual bool isModule() const + bool isModule() const override { return getNSAlias()->isModule(); } - virtual bool isLibrary() const + bool isLibrary() const override { return getNSAlias()->isLibrary(); } - virtual bool isInline() const + bool isInline() const override { return getNSAlias()->isInline(); } - virtual bool isLinkableInProject() const + bool isLinkableInProject() const override { return getNSAlias()->isLinkableInProject(); } - virtual bool isLinkable() const + bool isLinkable() const override { return getNSAlias()->isLinkable(); } - virtual bool isVisibleInHierarchy() const + bool isVisibleInHierarchy() const override { return getNSAlias()->isVisibleInHierarchy(); } - virtual bool hasDetailedDescription() const + bool hasDetailedDescription() const override { return getNSAlias()->hasDetailedDescription(); } - virtual const Definition *findInnerCompound(const QCString &name) const + const Definition *findInnerCompound(const QCString &name) const override { return getNSAlias()->findInnerCompound(name); } - virtual bool subGrouping() const + bool subGrouping() const override { return getNSAlias()->subGrouping(); } - virtual MemberList *getMemberList(MemberListType lt) const + MemberList *getMemberList(MemberListType lt) const override { return getNSAlias()->getMemberList(lt); } - virtual const MemberLists &getMemberLists() const + const MemberLists &getMemberLists() const override { return getNSAlias()->getMemberLists(); } - virtual const MemberDef *getMemberByName(const QCString &name) const + const MemberDef *getMemberByName(const QCString &name) const override { return getNSAlias()->getMemberByName(name); } - virtual const MemberGroupList &getMemberGroups() const + const MemberGroupList &getMemberGroups() const override { return getNSAlias()->getMemberGroups(); } - virtual ClassLinkedRefMap getClasses() const + ClassLinkedRefMap getClasses() const override { return getNSAlias()->getClasses(); } - virtual ClassLinkedRefMap getInterfaces() const + ClassLinkedRefMap getInterfaces() const override { return getNSAlias()->getInterfaces(); } - virtual ClassLinkedRefMap getStructs() const + ClassLinkedRefMap getStructs() const override { return getNSAlias()->getStructs(); } - virtual ClassLinkedRefMap getExceptions() const + ClassLinkedRefMap getExceptions() const override { return getNSAlias()->getExceptions(); } - virtual NamespaceLinkedRefMap getNamespaces() const + NamespaceLinkedRefMap getNamespaces() const override { return getNSAlias()->getNamespaces(); } - virtual ConceptLinkedRefMap getConcepts() const + ConceptLinkedRefMap getConcepts() const override { return getNSAlias()->getConcepts(); } - virtual QCString title() const + QCString title() const override { return getNSAlias()->title(); } - virtual QCString compoundTypeString() const + QCString compoundTypeString() const override { return getNSAlias()->compoundTypeString(); } - virtual int countVisibleMembers() const + int countVisibleMembers() const override { return getNSAlias()->countVisibleMembers(); } }; diff --git a/src/pagedef.cpp b/src/pagedef.cpp index 50bb4dac76c..09338ffeeff 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -31,37 +31,37 @@ class PageDefImpl : public DefinitionMixin { public: PageDefImpl(const QCString &f,int l,const QCString &n,const QCString &d,const QCString &t); - virtual ~PageDefImpl(); - - virtual void setFileName(const QCString &name) override; - virtual void setLocalToc(const LocalToc &tl) override; - virtual void setShowLineNo(bool) override; - virtual DefType definitionType() const override { return TypePage; } - virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } - virtual bool isLinkableInProject() const override { return /*hasDocumentation() &&*/ !isReference(); } - virtual bool isLinkable() const override { return isLinkableInProject() || isReference(); } - virtual QCString getOutputFileBase() const override; - virtual QCString anchor() const override { return QCString(); } - virtual void findSectionsInDocumentation() override; - virtual QCString title() const override { return m_title; } - virtual const GroupDef * getGroupDef() const override; - virtual const PageLinkedRefMap &getSubPages() const override { return m_subPages; } - virtual void addInnerCompound(Definition *d) override; - virtual bool visibleInIndex() const override; - virtual bool documentedPage() const override; - virtual bool hasSubPages() const override; - virtual bool hasParentPage() const override; - virtual bool hasTitle() const override; - virtual LocalToc localToc() const override { return m_localToc; } - virtual void setPageScope(Definition *d) override { m_pageScope = d; } - virtual Definition *getPageScope() const override { return m_pageScope; } - virtual QCString displayName(bool=TRUE) const override { return hasTitle() ? m_title : DefinitionMixin::name(); } - virtual bool showLineNo() const override; - virtual void setTitle(const QCString &title) override; - virtual void writeDocumentation(OutputList &ol) override; - virtual void writeTagFile(TextStream &) override; - virtual void setNestingLevel(int l) override; - virtual void writePageDocumentation(OutputList &ol) const override; + ~PageDefImpl(); + + void setFileName(const QCString &name) override; + void setLocalToc(const LocalToc &tl) override; + void setShowLineNo(bool) override; + DefType definitionType() const override { return TypePage; } + CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } + bool isLinkableInProject() const override { return /*hasDocumentation() &&*/ !isReference(); } + bool isLinkable() const override { return isLinkableInProject() || isReference(); } + QCString getOutputFileBase() const override; + QCString anchor() const override { return QCString(); } + void findSectionsInDocumentation() override; + QCString title() const override { return m_title; } + const GroupDef * getGroupDef() const override; + const PageLinkedRefMap &getSubPages() const override { return m_subPages; } + void addInnerCompound(Definition *d) override; + bool visibleInIndex() const override; + bool documentedPage() const override; + bool hasSubPages() const override; + bool hasParentPage() const override; + bool hasTitle() const override; + LocalToc localToc() const override { return m_localToc; } + void setPageScope(Definition *d) override { m_pageScope = d; } + Definition *getPageScope() const override { return m_pageScope; } + QCString displayName(bool=TRUE) const override { return hasTitle() ? m_title : DefinitionMixin::name(); } + bool showLineNo() const override; + void setTitle(const QCString &title) override; + void writeDocumentation(OutputList &ol) override; + void writeTagFile(TextStream &) override; + void setNestingLevel(int l) override; + void writePageDocumentation(OutputList &ol) const override; private: QCString m_fileName; From 85db09eee0c94592da43a531d4339af2a1da8e9f Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 23 Nov 2023 18:05:10 +0100 Subject: [PATCH 2/2] Give functions override attribute CLANG compilation warnings some sonarcloud warnings --- src/classdef.cpp | 2 +- src/conceptdef.cpp | 2 +- src/dirdef.cpp | 2 +- src/filedef.cpp | 2 +- src/groupdef.cpp | 2 +- src/memberdef.cpp | 10 +++++----- src/namespacedef.cpp | 2 +- src/pagedef.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index 32b04d99cca..ccef511a4b0 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -417,7 +417,7 @@ class ClassDefAliasImpl : public DefinitionAliasMixin public: ClassDefAliasImpl(const Definition *newScope,const ClassDef *cd) : DefinitionAliasMixin(newScope,cd) { init(); } - ~ClassDefAliasImpl() { deinit(); } + ~ClassDefAliasImpl() override { deinit(); } DefType definitionType() const override { return TypeClass; } const ClassDef *getCdAlias() const { return toClassDef(getAlias()); } diff --git a/src/conceptdef.cpp b/src/conceptdef.cpp index eef36d0832e..923a120adba 100644 --- a/src/conceptdef.cpp +++ b/src/conceptdef.cpp @@ -102,7 +102,7 @@ class ConceptDefAliasImpl : public DefinitionAliasMixin public: ConceptDefAliasImpl(const Definition *newScope,const ConceptDef *cd) : DefinitionAliasMixin(newScope,cd) { init(); } - ~ConceptDefAliasImpl() { deinit(); } + ~ConceptDefAliasImpl() override { deinit(); } const ConceptDef *getCdAlias() const { return toConceptDef(getAlias()); } ConceptDef *resolveAlias() { return const_cast(getCdAlias()); } diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 168484e95f7..79b27794d8c 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -39,7 +39,7 @@ class DirDefImpl : public DefinitionMixin { public: DirDefImpl(const QCString &path); - ~DirDefImpl(); + ~DirDefImpl() override; DefType definitionType() const override { return TypeDir; } CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } diff --git a/src/filedef.cpp b/src/filedef.cpp index 51e2685b690..33f92813bad 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -121,7 +121,7 @@ class FileDefImpl : public DefinitionMixin { public: FileDefImpl(const QCString &p,const QCString &n,const QCString &ref=QCString(),const QCString &dn=QCString()); - ~FileDefImpl(); + ~FileDefImpl() override; DefType definitionType() const override { return TypeFile; } CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } diff --git a/src/groupdef.cpp b/src/groupdef.cpp index d5b8616ea57..9636c61ff3c 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -54,7 +54,7 @@ class GroupDefImpl : public DefinitionMixin { public: GroupDefImpl(const QCString &fileName,int line,const QCString &name,const QCString &title,const QCString &refFileName=QCString()); - ~GroupDefImpl(); + ~GroupDefImpl() override; DefType definitionType() const override { return TypeGroup; } CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Default; } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 82104a6e574..b3cce07d91f 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -525,13 +525,13 @@ class MemberDefAliasImpl : public DefinitionAliasMixin public: MemberDefAliasImpl(const Definition *newScope,const MemberDef *md) : DefinitionAliasMixin(newScope,md), m_memberGroup(0) { init(); } - ~MemberDefAliasImpl() { deinit(); } + ~MemberDefAliasImpl() override { deinit(); } DefType definitionType() const override { return TypeMember; } - const MemberDef *getMdAlias() const { return toMemberDef(getAlias()); } - MemberDef *getMdAlias() { return toMemberDef(const_cast(getAlias())); } - MemberDef *resolveAlias() { return const_cast(getMdAlias()); } - const MemberDef *resolveAlias() const { return getMdAlias(); } + const MemberDef *getMdAlias() const { return toMemberDef(getAlias()); } + MemberDef *getMdAlias() { return toMemberDef(const_cast(getAlias())); } + MemberDef *resolveAlias() override { return const_cast(getMdAlias()); } + const MemberDef *resolveAlias() const override { return getMdAlias(); } std::unique_ptr deepCopy() const override { return createMemberDefAlias(getScope(),getMdAlias()); diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 62791ac7dd5..da19e0772b1 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -180,7 +180,7 @@ class NamespaceDefAliasImpl : public DefinitionAliasMixin public: NamespaceDefAliasImpl(const Definition *newScope,const NamespaceDef *nd) : DefinitionAliasMixin(newScope,nd) { init(); } - ~NamespaceDefAliasImpl() { deinit(); } + ~NamespaceDefAliasImpl() override{ deinit(); } DefType definitionType() const override { return TypeNamespace; } const NamespaceDef *getNSAlias() const { return toNamespaceDef(getAlias()); } diff --git a/src/pagedef.cpp b/src/pagedef.cpp index 09338ffeeff..cd52dd5a2a1 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -31,7 +31,7 @@ class PageDefImpl : public DefinitionMixin { public: PageDefImpl(const QCString &f,int l,const QCString &n,const QCString &d,const QCString &t); - ~PageDefImpl(); + ~PageDefImpl() override; void setFileName(const QCString &name) override; void setLocalToc(const LocalToc &tl) override;