diff --git a/src/classdef.cpp b/src/classdef.cpp index 1fa9124c961..7b237115d5c 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -191,157 +191,157 @@ class ClassDefImpl : public DefinitionMixin const QCString &ref=QCString(),const QCString &fName=QCString(), bool isSymbol=TRUE,bool isJavaEnum=FALSE); - virtual ClassDef *resolveAlias() { return this; } - virtual DefType definitionType() const { return TypeClass; } - virtual CodeSymbolType codeSymbolType() const; - virtual QCString getOutputFileBase() const; - virtual QCString getInstanceOutputFileBase() const; - virtual QCString getSourceFileBase() const; - virtual QCString getReference() const; - virtual bool isReference() const; - virtual bool isLocal() const; - virtual ClassLinkedRefMap getClasses() const; - virtual bool hasDocumentation() const; - virtual bool hasDetailedDescription() const; - virtual QCString collaborationGraphFileName() const; - virtual QCString inheritanceGraphFileName() const; - virtual QCString displayName(bool includeScope=TRUE) const; - virtual CompoundType compoundType() const; - virtual QCString compoundTypeString() const; - virtual const BaseClassList &baseClasses() const; - virtual void updateBaseClasses(const BaseClassList &bcd); - virtual const BaseClassList &subClasses() const; - virtual void updateSubClasses(const BaseClassList &bcd); - virtual const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const; - virtual Protection protection() const; - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual bool isVisibleInHierarchy() const; - virtual bool visibleInParentsDeclList() const; - virtual const ArgumentList &templateArguments() const; - virtual FileDef *getFileDef() const; - virtual const MemberDef *getMemberByName(const QCString &) const; - virtual int isBaseClass(const ClassDef *bcd,bool followInstances,const QCString &templSpec) const; - virtual bool isSubClass(ClassDef *bcd,int level=0) const; - virtual bool isAccessibleMember(const MemberDef *md) const; - virtual const TemplateInstanceList &getTemplateInstances() const; - virtual const ClassDef *templateMaster() const; - virtual bool isTemplate() const; - virtual const IncludeInfo *includeInfo() const; - virtual const UsesClassList &usedImplementationClasses() const; - virtual const UsesClassList &usedByImplementationClasses() const; - virtual const ConstraintClassList &templateTypeConstraints() const; - virtual bool isTemplateArgument() const; - virtual const Definition *findInnerCompound(const QCString &name) const; - virtual ArgumentLists getTemplateParameterLists() const; + 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 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( - const ArgumentLists *actualParams=0,uint32_t *actualParamIndex=0) const; - virtual bool isAbstract() const; - virtual bool isObjectiveC() const; - virtual bool isFortran() const; - virtual bool isCSharp() const; - virtual bool isFinal() const; - virtual bool isSealed() const; - virtual bool isPublished() const; - virtual bool isExtension() const; - virtual bool isForwardDeclared() const; - virtual bool isInterface() const; - virtual ClassDef *categoryOf() const; - virtual QCString className() const; - virtual MemberList *getMemberList(MemberListType lt) const; - virtual const MemberLists &getMemberLists() const; - virtual const MemberGroupList &getMemberGroups() const; - virtual const TemplateNameMap &getTemplateBaseClassNames() const; - virtual bool isUsedOnly() const; - virtual QCString anchor() const; - virtual bool isEmbeddedInOuterScope() const; - virtual bool isSimple() const; - virtual const ClassDef *tagLessReference() const; - virtual const MemberDef *isSmartPointer() const; - virtual bool isJavaEnum() const; - virtual QCString title() const; - virtual QCString generatedFromFiles() const; - virtual const FileList &usedFiles() const; - virtual const ArgumentList &typeConstraints() const; - virtual const ExampleList &getExamples() const; - virtual bool hasExamples() const; - virtual QCString getMemberListFileName() const; - virtual bool subGrouping() const; - virtual bool isSliceLocal() const; - virtual bool hasNonReferenceSuperClass() const; - virtual QCString requiresClause() const; - virtual StringVector getQualifiers() const; + 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, - const QCString &templSpec,bool &freshInstance) const; - - virtual void insertBaseClass(ClassDef *,const QCString &name,Protection p,Specifier s,const QCString &t=QCString()); - virtual void insertSubClass(ClassDef *,Protection p,Specifier s,const QCString &t=QCString()); - virtual void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force); - virtual void insertMember(MemberDef *); - virtual void insertUsedFile(const FileDef *); - virtual bool addExample(const QCString &anchor,const QCString &name, const QCString &file); - virtual void mergeCategory(ClassDef *category); - virtual void setFileDef(FileDef *fd); - virtual void setSubGrouping(bool enabled); - virtual void setProtection(Protection p); - virtual void setGroupDefForAllMembers(GroupDef *g,Grouping::GroupPri_t pri,const QCString &fileName,int startLine,bool hasDocs); - virtual void addInnerCompound(Definition *d); - virtual void addUsedClass(ClassDef *cd,const QCString &accessName,Protection prot); - virtual void addUsedByClass(ClassDef *cd,const QCString &accessName,Protection prot); - virtual void setIsStatic(bool b); - virtual void setCompoundType(CompoundType t); - virtual void setClassName(const QCString &name); - virtual void setClassSpecifier(uint64_t spec); - virtual void addQualifiers(const StringVector &qualifiers); - virtual void setTemplateArguments(const ArgumentList &al); - virtual void setTemplateBaseClassNames(const TemplateNameMap &templateNames); - virtual void setTemplateMaster(const ClassDef *tm); - virtual void setTypeConstraints(const ArgumentList &al); - virtual void addMembersToTemplateInstance(const ClassDef *cd,const ArgumentList &templateArguments,const QCString &templSpec); - virtual void makeTemplateArgument(bool b=TRUE); - virtual void setCategoryOf(ClassDef *cd); - virtual void setUsedOnly(bool b); - virtual void setTagLessReference(const ClassDef *cd); - virtual void setMetaData(const QCString &md); - virtual void findSectionsInDocumentation(); - virtual void addMembersToMemberGroup(); - virtual void addListReferences(); - virtual void addTypeConstraints(); - virtual void computeAnchors(); - virtual void mergeMembers(); - virtual void sortMemberLists(); - virtual void distributeMemberGroupDocumentation(); - virtual void writeDocumentation(OutputList &ol) const; - virtual void writeDocumentationForInnerClasses(OutputList &ol) const; - virtual void writeMemberPages(OutputList &ol) const; - virtual void writeMemberList(OutputList &ol) const; + 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 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(uint64_t 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, - const ClassDef *inheritedFrom,const QCString &inheritId) const; - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const; - virtual void writeSummaryLinks(OutputList &ol) const; - virtual void reclassifyMember(MemberDefMutable *md,MemberType t); - virtual void writeInlineDocumentation(OutputList &ol) const; + 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, - const QCString &header,bool localNames) const; - virtual void removeMemberFromLists(MemberDef *md); - virtual void setAnonymousEnumType(); - virtual void countMembers(); - virtual void sortAllMembersList(); + 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; virtual void addGroupedInheritedMembers(OutputList &ol,MemberListType lt, - const ClassDef *inheritedFrom,const QCString &inheritId) const; - virtual void writeTagFile(TextStream &) const; + const ClassDef *inheritedFrom,const QCString &inheritId) const override; + virtual void writeTagFile(TextStream &) const override; - virtual int countMembersIncludingGrouped(MemberListType lt,const ClassDef *inheritedFrom,bool additional) const; - virtual int countInheritanceNodes() const; + 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 lt2,bool invert,bool showAlways,ClassDefSet &visitedClasses) const; + int lt2,bool invert,bool showAlways,ClassDefSet &visitedClasses) const override; virtual 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; - virtual void setRequiresClause(const QCString &req); + int lt2=-1,bool invert=FALSE,bool showAlways=FALSE) const override; + virtual void setRequiresClause(const QCString &req) override; private: void addUsedInterfaceClasses(MemberDef *md,const QCString &typeStr); diff --git a/src/conceptdef.cpp b/src/conceptdef.cpp index 927ccf83636..17a241c08a3 100644 --- a/src/conceptdef.cpp +++ b/src/conceptdef.cpp @@ -35,37 +35,37 @@ class ConceptDefImpl : public DefinitionMixin const QCString &name,const QCString &tagRef=QCString(),const QCString &tagFile=QCString()); ~ConceptDefImpl(); - virtual ConceptDef *resolveAlias() { return this; } + ConceptDef *resolveAlias() { return this; } //---------- ConceptDef - virtual DefType definitionType() const; - virtual CodeSymbolType codeSymbolType() const { return CodeSymbolType::Concept; } - virtual QCString getOutputFileBase() const; - virtual bool hasDetailedDescription() const; - virtual QCString displayName(bool includeScope=true) const; - virtual const IncludeInfo *includeInfo() const; - virtual ArgumentList getTemplateParameterList() const; - virtual QCString anchor() const; - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual QCString initializer() const; + 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, - const QCString &header,bool localNames) const; - virtual const NamespaceDef *getNamespaceDef() const; - virtual const FileDef *getFileDef() const; - virtual QCString title() const; - virtual int groupId() const; + const QCString &header,bool localNames) const override; + virtual const NamespaceDef *getNamespaceDef() const override; + virtual const FileDef *getFileDef() const override; + virtual QCString title() const override; + virtual int groupId() const override; //---------- ConceptDefMutable - virtual void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force); - virtual void setTemplateArguments(const ArgumentList &al); - virtual void setNamespace(NamespaceDef *nd); - virtual void setFileDef(FileDef *fd); - virtual void writeTagFile(TextStream &); - virtual void writeDocumentation(OutputList &); - virtual void setInitializer(const QCString &init); - virtual void findSectionsInDocumentation(); - virtual void setGroupId(int id); + 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 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; //---------- Helpers void writeBriefDescription(OutputList &) const; diff --git a/src/definitionimpl.h b/src/definitionimpl.h index e86fafa2f5d..b9eb5226d08 100644 --- a/src/definitionimpl.h +++ b/src/definitionimpl.h @@ -150,135 +150,135 @@ class DefinitionMixin : public Base bool isSymbol=TRUE) : m_impl(this,defFileName,defLine,defColumn,name,b,d,isSymbol) {} virtual ~DefinitionMixin() = default; - virtual bool isAlias() const { return FALSE; } + virtual bool isAlias() const override { return FALSE; } //======== Definition - virtual const QCString &name() const { return m_impl.name(); } - virtual bool isAnonymous() const { return m_impl.isAnonymous(); } - virtual const QCString &localName() const { return m_impl.localName(); } - virtual QCString qualifiedName() const { return m_impl.qualifiedName(); } - virtual QCString symbolName() const { return m_impl.symbolName(); } - virtual QCString getSourceFileBase() const { return m_impl.getSourceFileBase(); } - virtual QCString getSourceAnchor() const { return m_impl.getSourceAnchor(); } - virtual QCString documentation() const { return m_impl.documentation(); } - virtual int docLine() const { return m_impl.docLine(); } - virtual QCString docFile() const { return m_impl.docFile(); } - virtual QCString briefDescription(bool abbreviate=FALSE) const { return m_impl.briefDescription(abbreviate); } - virtual QCString briefDescriptionAsTooltip() const { return m_impl.briefDescriptionAsTooltip(); } - virtual int briefLine() const { return m_impl.briefLine(); } - virtual QCString inbodyDocumentation() const { return m_impl.inbodyDocumentation(); } - virtual QCString inbodyFile() const { return m_impl.inbodyFile(); } - virtual int inbodyLine() const { return m_impl.inbodyLine(); } - virtual QCString briefFile() const { return m_impl.briefFile(); } - virtual QCString getDefFileName() const { return m_impl.getDefFileName(); } - virtual QCString getDefFileExtension() const { return m_impl.getDefFileExtension(); } - virtual int getDefLine() const { return m_impl.getDefLine(); } - virtual int getDefColumn() const { return m_impl.getDefColumn(); } - virtual bool hasDocumentation() const { return m_impl.hasDocumentation(); } - virtual bool hasUserDocumentation() const { return m_impl.hasUserDocumentation(); } - virtual bool isVisibleInProject() const { return m_impl.isVisibleInProject(); } - virtual bool isVisible() const { return m_impl.isVisible(); } - virtual bool isHidden() const { return m_impl.isHidden(); } - virtual bool isArtificial() const { return m_impl.isArtificial(); } - virtual QCString getReference() const { return m_impl.getReference(); } - virtual bool isReference() const { return m_impl.isReference(); } - virtual QCString externalReference(const QCString &relPath) const { return m_impl.externalReference(relPath); } - virtual int getStartDefLine() const { return m_impl.getStartDefLine(); } - virtual int getStartBodyLine() const { return m_impl.getStartBodyLine(); } - virtual int getEndBodyLine() const { return m_impl.getEndBodyLine(); } - virtual const FileDef *getBodyDef() const { return m_impl.getBodyDef(); } - virtual SrcLangExt getLanguage() const { return m_impl.getLanguage(); } - virtual const GroupList &partOfGroups() const { return m_impl.partOfGroups(); } - virtual bool isLinkableViaGroup() const { return m_impl.isLinkableViaGroup(); } - virtual const RefItemVector &xrefListItems() const { return m_impl.xrefListItems(); } - virtual const Definition *findInnerCompound(const QCString &name) const { return m_impl.findInnerCompound(name); } - virtual Definition *getOuterScope() const { return m_impl.getOuterScope(); } - virtual const MemberVector &getReferencesMembers() const { return m_impl.getReferencesMembers(); } - virtual const MemberVector &getReferencedByMembers() const { return m_impl.getReferencedByMembers(); } - virtual bool hasSections() const { return m_impl.hasSections(); } - virtual bool hasSources() const { return m_impl.hasSources(); } - virtual bool hasBriefDescription() const { return m_impl.hasBriefDescription(); } - virtual QCString id() const { return m_impl.id(); } - virtual const SectionRefs &getSectionRefs() const { return m_impl.getSectionRefs(); } + 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 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(); } //======== DefinitionMutable - virtual void setName(const QCString &name) { m_impl.setName(name); } - virtual void setId(const QCString &name) { m_impl.setId(name); } - virtual void setDefFile(const QCString& df,int defLine,int defColumn) + 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 { m_impl.setDefFile(df,defLine,defColumn); } - virtual void setDocumentation(const QCString &doc,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE) + virtual 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) + virtual 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) + virtual void setInbodyDocumentation(const QCString &doc,const QCString &docFile,int docLine) override { m_impl.setInbodyDocumentation(doc,docFile,docLine); } - virtual void setReference(const QCString &r) + virtual void setReference(const QCString &r) override { m_impl.setReference(r); } - virtual void addSectionsToDefinition(const std::vector &anchorList) + virtual void addSectionsToDefinition(const std::vector &anchorList) override { m_impl.addSectionsToDefinition(anchorList); } - virtual void setBodySegment(int defLine,int bls,int ble) + virtual void setBodySegment(int defLine,int bls,int ble) override { m_impl.setBodySegment(defLine,bls,ble); } - virtual void setBodyDef(const FileDef *fd) + virtual void setBodyDef(const FileDef *fd) override { m_impl.setBodyDef(fd); } - virtual void addSourceReferencedBy(MemberDef *md) + virtual void addSourceReferencedBy(MemberDef *md) override { m_impl.addSourceReferencedBy(md); } - virtual void addSourceReferences(MemberDef *md) + virtual void addSourceReferences(MemberDef *md) override { m_impl.addSourceReferences(md); } - virtual void setRefItems(const RefItemVector &sli) + virtual void setRefItems(const RefItemVector &sli) override { m_impl.setRefItems(sli); } - virtual void mergeRefItems(Definition *def) + virtual void mergeRefItems(Definition *def) override { m_impl.mergeRefItems(def); } - virtual void mergeReferences(const Definition *other) + virtual void mergeReferences(const Definition *other) override { m_impl.mergeReferences(other); } - virtual void mergeReferencedBy(const Definition *other) + virtual void mergeReferencedBy(const Definition *other) override { m_impl.mergeReferencedBy(other); } - virtual void addInnerCompound(Definition *def) + virtual void addInnerCompound(Definition *def) override { m_impl.addInnerCompound(def); } - virtual void setOuterScope(Definition *def) + virtual void setOuterScope(Definition *def) override { m_impl.setOuterScope(def); } - virtual void setHidden(bool b) + virtual void setHidden(bool b) override { m_impl.setHidden(b); } - virtual void setArtificial(bool b) + virtual void setArtificial(bool b) override { m_impl.setArtificial(b); } - virtual void setLanguage(SrcLangExt lang) + virtual void setLanguage(SrcLangExt lang) override { m_impl.setLanguage(lang); } - virtual void writeSourceDef(OutputList &ol,const QCString &scopeName) const + virtual void writeSourceDef(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceDef(ol,scopeName); } - virtual void writeInlineCode(OutputList &ol,const QCString &scopeName) const + virtual void writeInlineCode(OutputList &ol,const QCString &scopeName) const override { m_impl.writeInlineCode(ol,scopeName); } - virtual bool hasSourceRefs() const + virtual bool hasSourceRefs() const override { return m_impl.hasSourceRefs(); } - virtual bool hasSourceReffedBy() const + virtual bool hasSourceReffedBy() const override { return m_impl.hasSourceReffedBy(); } - virtual void writeSourceRefs(OutputList &ol,const QCString &scopeName) const + virtual void writeSourceRefs(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceRefs(ol,scopeName); } - virtual void writeSourceReffedBy(OutputList &ol,const QCString &scopeName) const + virtual void writeSourceReffedBy(OutputList &ol,const QCString &scopeName) const override { m_impl.writeSourceReffedBy(ol,scopeName); } - virtual void makePartOfGroup(GroupDef *gd) + virtual void makePartOfGroup(GroupDef *gd) override { m_impl.makePartOfGroup(gd); } - virtual void writeNavigationPath(OutputList &ol) const + virtual void writeNavigationPath(OutputList &ol) const override { m_impl.writeNavigationPath(ol); } - virtual QCString navigationPathAsString() const + virtual QCString navigationPathAsString() const override { return m_impl.navigationPathAsString(); } - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const + virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *md) const override { m_impl.writeQuickMemberLinks(ol,md); } - virtual void writeSummaryLinks(OutputList &ol) const + virtual void writeSummaryLinks(OutputList &ol) const override { m_impl.writeSummaryLinks(ol); } - virtual QCString pathFragment() const + virtual QCString pathFragment() const override { return m_impl.pathFragment(); } - virtual void writeDocAnchorsToTagFile(TextStream &fs) const + virtual void writeDocAnchorsToTagFile(TextStream &fs) const override { m_impl.writeDocAnchorsToTagFile(fs); } - virtual void setLocalName(const QCString &name) + virtual void setLocalName(const QCString &name) override { m_impl.setLocalName(name); } - virtual void addSectionsToIndex() + virtual void addSectionsToIndex() override { m_impl.addSectionsToIndex(); } - virtual void writeToc(OutputList &ol, const LocalToc <) const + virtual void writeToc(OutputList &ol, const LocalToc <) const override { m_impl.writeToc(ol,lt); } - virtual void computeTooltip() + virtual void computeTooltip() override { m_impl.computeTooltip(); } - virtual void _setSymbolName(const QCString &name) + virtual void _setSymbolName(const QCString &name) override { m_impl._setSymbolName(name); } - virtual QCString _symbolName() const + virtual QCString _symbolName() const override { return m_impl._symbolName(); } protected: @@ -286,9 +286,9 @@ class DefinitionMixin : public Base DefinitionMixin(const DefinitionMixin &def) = default; private: - virtual Definition *toDefinition_() { return this; } - virtual DefinitionMutable *toDefinitionMutable_() { return this; } - virtual const DefinitionImpl *toDefinitionImpl_() const { return &m_impl; } + virtual Definition *toDefinition_() override { return this; } + virtual DefinitionMutable *toDefinitionMutable_() override { return this; } + virtual const DefinitionImpl *toDefinitionImpl_() const override { return &m_impl; } DefinitionImpl m_impl; }; @@ -322,106 +322,106 @@ class DefinitionAliasMixin : public Base virtual ~DefinitionAliasMixin() = default; - virtual bool isAlias() const { return TRUE; } + virtual bool isAlias() const override { return TRUE; } //======== Definition - virtual const QCString &name() const + virtual const QCString &name() const override { return m_impl.name(); } - virtual bool isAnonymous() const + virtual bool isAnonymous() const override { return m_alias->isAnonymous(); } - virtual const QCString &localName() const + virtual const QCString &localName() const override { return m_alias->localName(); } - virtual QCString qualifiedName() const + virtual QCString qualifiedName() const override { return m_impl.qualifiedName(); } - virtual QCString symbolName() const + virtual QCString symbolName() const override { return m_alias->symbolName(); } - virtual QCString getSourceFileBase() const + virtual QCString getSourceFileBase() const override { return m_alias->getSourceFileBase(); } - virtual QCString getSourceAnchor() const + virtual QCString getSourceAnchor() const override { return m_alias->getSourceAnchor(); } - virtual QCString documentation() const + virtual QCString documentation() const override { return m_alias->documentation(); } - virtual int docLine() const + virtual int docLine() const override { return m_alias->docLine(); } - virtual QCString docFile() const + virtual QCString docFile() const override { return m_alias->docFile(); } - virtual QCString briefDescription(bool abbreviate=FALSE) const + virtual QCString briefDescription(bool abbreviate=FALSE) const override { return m_alias->briefDescription(abbreviate); } - virtual QCString briefDescriptionAsTooltip() const + virtual QCString briefDescriptionAsTooltip() const override { return m_alias->briefDescriptionAsTooltip(); } - virtual int briefLine() const + virtual int briefLine() const override { return m_alias->briefLine(); } - virtual QCString inbodyDocumentation() const + virtual QCString inbodyDocumentation() const override { return m_alias->inbodyDocumentation(); } - virtual QCString inbodyFile() const + virtual QCString inbodyFile() const override { return m_alias->inbodyFile(); } - virtual int inbodyLine() const + virtual int inbodyLine() const override { return m_alias->inbodyLine(); } - virtual QCString briefFile() const + virtual QCString briefFile() const override { return m_alias->briefFile(); } - virtual QCString getDefFileName() const + virtual QCString getDefFileName() const override { return m_alias->getDefFileName(); } - virtual QCString getDefFileExtension() const + virtual QCString getDefFileExtension() const override { return m_alias->getDefFileExtension(); } - virtual int getDefLine() const + virtual int getDefLine() const override { return m_alias->getDefLine(); } - virtual int getDefColumn() const + virtual int getDefColumn() const override { return m_alias->getDefColumn(); } - virtual bool hasDocumentation() const + virtual bool hasDocumentation() const override { return m_alias->hasDocumentation(); } - virtual bool hasUserDocumentation() const + virtual bool hasUserDocumentation() const override { return m_alias->hasUserDocumentation(); } - virtual bool isVisibleInProject() const + virtual bool isVisibleInProject() const override { return m_alias->isVisibleInProject(); } - virtual bool isVisible() const + virtual bool isVisible() const override { return m_alias->isVisible(); } - virtual bool isHidden() const + virtual bool isHidden() const override { return m_alias->isHidden(); } - virtual bool isArtificial() const + virtual bool isArtificial() const override { return m_alias->isArtificial(); } - virtual QCString getReference() const + virtual QCString getReference() const override { return m_alias->getReference(); } - virtual bool isReference() const + virtual bool isReference() const override { return m_alias->isReference(); } - virtual QCString externalReference(const QCString &relPath) const + virtual QCString externalReference(const QCString &relPath) const override { return m_alias->externalReference(relPath); } - virtual int getStartDefLine() const + virtual int getStartDefLine() const override { return m_alias->getStartDefLine(); } - virtual int getStartBodyLine() const + virtual int getStartBodyLine() const override { return m_alias->getStartBodyLine(); } - virtual int getEndBodyLine() const + virtual int getEndBodyLine() const override { return m_alias->getEndBodyLine(); } - virtual const FileDef *getBodyDef() const + virtual const FileDef *getBodyDef() const override { return m_alias->getBodyDef(); } - virtual SrcLangExt getLanguage() const + virtual SrcLangExt getLanguage() const override { return m_alias->getLanguage(); } - virtual const GroupList &partOfGroups() const + virtual const GroupList &partOfGroups() const override { return m_alias->partOfGroups(); } - virtual bool isLinkableViaGroup() const + virtual bool isLinkableViaGroup() const override { return m_alias->isLinkableViaGroup(); } - virtual const RefItemVector &xrefListItems() const + virtual const RefItemVector &xrefListItems() const override { return m_alias->xrefListItems(); } - virtual const Definition *findInnerCompound(const QCString &name) const + virtual const Definition *findInnerCompound(const QCString &name) const override { return m_alias->findInnerCompound(name); } - virtual Definition *getOuterScope() const + virtual Definition *getOuterScope() const override { return const_cast(m_scope); } - virtual const MemberVector &getReferencesMembers() const + virtual const MemberVector &getReferencesMembers() const override { return m_alias->getReferencesMembers(); } - virtual const MemberVector &getReferencedByMembers() const + virtual const MemberVector &getReferencedByMembers() const override { return m_alias->getReferencedByMembers(); } - virtual bool hasSections() const + virtual bool hasSections() const override { return m_alias->hasSections(); } - virtual bool hasSources() const + virtual bool hasSources() const override { return m_alias->hasSources(); } - virtual bool hasBriefDescription() const + virtual bool hasBriefDescription() const override { return m_alias->hasBriefDescription(); } - virtual QCString id() const + virtual QCString id() const override { return m_alias->id(); } - virtual const SectionRefs &getSectionRefs() const + virtual const SectionRefs &getSectionRefs() const override { return m_alias->getSectionRefs(); } - virtual QCString navigationPathAsString() const + virtual QCString navigationPathAsString() const override { return m_alias->navigationPathAsString(); } - virtual QCString pathFragment() const + virtual QCString pathFragment() const override { return m_alias->pathFragment(); } protected: @@ -430,11 +430,11 @@ class DefinitionAliasMixin : public Base private: virtual Definition *toDefinition_() { return this; } - virtual DefinitionMutable *toDefinitionMutable_() { return 0; } - virtual const DefinitionImpl *toDefinitionImpl_() const { return 0; } + virtual DefinitionMutable *toDefinitionMutable_() override { return 0; } + virtual const DefinitionImpl *toDefinitionImpl_() const override { return 0; } - virtual void _setSymbolName(const QCString &name) { m_symbolName = name; } - virtual QCString _symbolName() const { return m_symbolName; } + virtual void _setSymbolName(const QCString &name) override { m_symbolName = name; } + virtual 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 0d9c16292f1..8dea8b08751 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -41,37 +41,37 @@ class DirDefImpl : public DefinitionMixin DirDefImpl(const QCString &path); virtual ~DirDefImpl(); - virtual DefType definitionType() const { return TypeDir; } - virtual CodeSymbolType codeSymbolType() const { return CodeSymbolType::Default; } - virtual QCString getOutputFileBase() const; - virtual QCString anchor() const { return QCString(); } - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual QCString displayName(bool=TRUE) const { return m_dispName; } - virtual const QCString shortName() const { return m_shortName; } - virtual void addSubDir(DirDef *subdir); - virtual const FileList &getFiles() const { return m_fileList; } - virtual void addFile(const FileDef *fd); - virtual const DirList &subDirs() const { return m_subdirs; } - virtual bool hasSubdirs() const { return !m_subdirs.empty(); } - virtual int level() const { return m_level; } - virtual DirDef *parent() const { return m_parent; } - virtual int dirCount() const { return m_dirCount; } - virtual const UsedDirLinkedMap &usedDirs() const { return m_usedDirs; } - virtual bool isParentOf(const DirDef *dir) const; - virtual bool depGraphIsTrivial() const; - virtual QCString shortTitle() const; - virtual bool hasDetailedDescription() const; - virtual void writeDocumentation(OutputList &ol); - virtual void writeTagFile(TextStream &t); - virtual void setDiskName(const QCString &name) { m_diskName = name; } - virtual void sort(); - virtual void setParent(DirDef *parent); - virtual void setDirCount(int count); - virtual void setLevel(); + 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, - const FileDef *dstFd,bool srcDirect, bool dstDirect); - virtual void computeDependencies(); + const FileDef *dstFd,bool srcDirect, bool dstDirect) override; + virtual void computeDependencies() override; public: static DirDef *mergeDirectoryInTree(const QCString &path); diff --git a/src/filedef.cpp b/src/filedef.cpp index 0ddff3f1569..eb9a7543aee 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -62,79 +62,79 @@ class FileDefImpl : public DefinitionMixin FileDefImpl(const QCString &p,const QCString &n,const QCString &ref=QCString(),const QCString &dn=QCString()); virtual ~FileDefImpl(); - virtual DefType definitionType() const { return TypeFile; } - virtual CodeSymbolType codeSymbolType() const { return CodeSymbolType::Default; } - virtual const QCString &name() const; - - virtual QCString displayName(bool=TRUE) const { return localName(); } - virtual QCString fileName() const { return m_fileName; } - virtual QCString getOutputFileBase() const; - virtual QCString anchor() const { return QCString(); } - virtual QCString getSourceFileBase() const; - virtual QCString includeName() const; - virtual QCString includeDependencyGraphFileName() const; - virtual QCString includedByDependencyGraphFileName() const; - virtual QCString absFilePath() const { return m_filePath; } - virtual const QCString &docName() const { return m_docname; } - virtual bool isSource() const { return m_isSource; } - virtual bool isDocumentationFile() const; - virtual const Definition *getSourceDefinition(int lineNr) const; - virtual const MemberDef *getSourceMember(int lineNr) const; - virtual QCString getPath() const { return m_path; } - virtual QCString getVersion() const { return m_fileVersion; } - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const { return isLinkableInProject() || isReference(); } - virtual bool isIncluded(const QCString &name) const; - virtual PackageDef *packageDef() const { return m_package; } - virtual DirDef *getDirDef() const { return m_dir; } - virtual const LinkedRefMap &getUsedNamespaces() const; - virtual const LinkedRefMap &getUsedClasses() const { return m_usingDeclList; } - virtual const IncludeInfoList &includeFileList() const { return m_includeList; } - virtual const IncludeInfoList &includedByFileList() const { return m_includedByList; } - virtual void getAllIncludeFilesRecursively(StringVector &incFiles) const; - virtual MemberList *getMemberList(MemberListType lt) const; - virtual const MemberLists &getMemberLists() const { return m_memberLists; } - virtual const MemberGroupList &getMemberGroups() const { return m_memberGroups; } - virtual const NamespaceLinkedRefMap &getNamespaces() const { return m_namespaces; } - virtual const ConceptLinkedRefMap &getConcepts() const { return m_concepts; } - virtual const ClassLinkedRefMap &getClasses() const { return m_classes; } - virtual QCString title() const; - virtual bool hasDetailedDescription() const; - virtual QCString fileVersion() const; - virtual bool subGrouping() const { return m_subGrouping; } - virtual void countMembers(); - virtual int numDocMembers() const; - virtual int numDecMembers() const; - virtual void addSourceRef(int line,const Definition *d,const MemberDef *md); - virtual void writeDocumentation(OutputList &ol); - virtual void writeMemberPages(OutputList &ol); - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const; - virtual void writeSummaryLinks(OutputList &ol) const; - virtual void writeTagFile(TextStream &t); - virtual void writeSourceHeader(OutputList &ol); - virtual void writeSourceBody(OutputList &ol,ClangTUParser *clangParser); - virtual void writeSourceFooter(OutputList &ol); - virtual void parseSource(ClangTUParser *clangParser); - virtual void setDiskName(const QCString &name); - virtual void insertMember(MemberDef *md); - virtual void insertClass(ClassDef *cd); - virtual void insertConcept(ConceptDef *cd); - virtual void insertNamespace(NamespaceDef *nd); - virtual void computeAnchors(); - virtual void setPackageDef(PackageDef *pd) { m_package=pd; } - virtual void setDirDef(DirDef *dd) { m_dir=dd; } - virtual void addUsingDirective(NamespaceDef *nd); - virtual void addUsingDeclaration(ClassDef *cd); - virtual void combineUsingRelations(); - virtual bool generateSourceFile() const; - virtual void sortMemberLists(); - virtual void addIncludeDependency(const FileDef *fd,const QCString &incName,bool local,bool imported); - virtual void addIncludedByDependency(const FileDef *fd,const QCString &incName,bool local,bool imported); - virtual void addMembersToMemberGroup(); - virtual void distributeMemberGroupDocumentation(); - virtual void findSectionsInDocumentation(); - virtual void addIncludedUsingDirectives(FileDefSet &visitedFiles); - virtual void addListReferences(); + 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 PackageDef *packageDef() const override { return m_package; } + virtual DirDef *getDirDef() const override { return m_dir; } + 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 setPackageDef(PackageDef *pd) override { m_package=pd; } + virtual void setDirDef(DirDef *dd) override { m_dir=dd; } + 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,bool local,bool imported) override; + virtual void addIncludedByDependency(const FileDef *fd,const QCString &incName,bool local,bool imported) override; + virtual void addMembersToMemberGroup() override; + virtual void distributeMemberGroupDocumentation() override; + virtual void findSectionsInDocumentation() override; + virtual void addIncludedUsingDirectives(FileDefSet &visitedFiles) override; + virtual void addListReferences() override; private: void setDiskNameLocal(const QCString &name); diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 02f9d095c8f..b992aec6cdd 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -55,64 +55,65 @@ class GroupDefImpl : public DefinitionMixin GroupDefImpl(const QCString &fileName,int line,const QCString &name,const QCString &title,const QCString &refFileName=QCString()); virtual ~GroupDefImpl(); - virtual DefType definitionType() const { return TypeGroup; } - virtual CodeSymbolType codeSymbolType() const { return CodeSymbolType::Default; } - virtual QCString getOutputFileBase() const; - virtual QCString anchor() const { return QCString(); } - virtual QCString displayName(bool=TRUE) const { return hasGroupTitle() ? m_title : DefinitionMixin::name(); } - virtual QCString groupTitle() const { return m_title; } - virtual void setGroupTitle( const QCString &newtitle ); - virtual bool hasGroupTitle( ) const { return m_titleSet; } - virtual void addFile(FileDef *def); - virtual bool containsFile(const FileDef *def) const; - virtual bool addClass(ClassDef *def); - virtual bool addConcept(ConceptDef *def); - virtual bool addNamespace(NamespaceDef *def); - virtual void addGroup(GroupDef *def); - virtual void addPage(PageDef *def); - virtual void addExample(PageDef *def); - virtual void addDir(DirDef *dd); - virtual bool insertMember(MemberDef *def,bool docOnly=FALSE); - virtual void removeMember(MemberDef *md); - virtual bool findGroup(const GroupDef *def) const; // true if def is a subgroup of this group - virtual void writeDocumentation(OutputList &ol); - virtual void writeMemberPages(OutputList &ol, int hierarchyLevel); - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const; - virtual void writeTagFile(TextStream &); - virtual size_t numDocMembers() const; - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual bool isASubGroup() const; - virtual void computeAnchors(); - virtual void countMembers(); - - virtual void addMembersToMemberGroup(); - virtual void distributeMemberGroupDocumentation(); - virtual void findSectionsInDocumentation(); - - virtual void addListReferences(); - virtual void sortMemberLists(); - virtual bool subGrouping() const { return m_subGrouping; } - - virtual void setGroupScope(Definition *d) { m_groupScope = d; } - virtual Definition *getGroupScope() const { return m_groupScope; } - - virtual MemberList *getMemberList(MemberListType lt) const; - virtual const MemberLists &getMemberLists() const { return m_memberLists; } + 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 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 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; } /* user defined member groups */ - virtual const MemberGroupList &getMemberGroups() const { return m_memberGroups; } - - virtual const FileList &getFiles() const { return m_fileList; } - virtual const ClassLinkedRefMap &getClasses() const { return m_classes; } - virtual const ConceptLinkedRefMap &getConcepts() const { return m_concepts; } - virtual const NamespaceLinkedRefMap &getNamespaces() const { return m_namespaces; } - virtual const GroupList &getSubGroups() const { return m_groups; } - virtual const PageLinkedRefMap &getPages() const { return m_pages; } - virtual const DirList & getDirs() const { return m_dirList; } - virtual const PageLinkedRefMap &getExamples() const { return m_examples; } - virtual bool hasDetailedDescription() const; - virtual void sortSubGroups(); + 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 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; private: void addMemberListToGroup(MemberList *,bool (MemberDef::*)() const); @@ -137,7 +138,6 @@ class GroupDefImpl : public DefinitionMixin void startMemberDocumentation(OutputList &ol); void endMemberDocumentation(OutputList &ol); void writeAuthorSection(OutputList &ol); - void writeSummaryLinks(OutputList &ol) const; void updateLanguage(const Definition *); void setGroupTitleLocal( const QCString &title); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 3c1350db116..83dbafda205 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -58,284 +58,283 @@ class MemberDefImpl : public DefinitionMixin Relationship related,MemberType t,const ArgumentList &tal, const ArgumentList &al,const QCString &metaData); - virtual DefType definitionType() const { return TypeMember; } - virtual MemberDef *resolveAlias() { return this; } - virtual const MemberDef *resolveAlias() const { return this; } - virtual CodeSymbolType codeSymbolType() const; - virtual std::unique_ptr deepCopy() const; - virtual void moveTo(Definition *); - virtual QCString getOutputFileBase() const; - virtual QCString getReference() const; - virtual QCString anchor() const; - virtual QCString declaration() const; - virtual QCString definition() const; - virtual QCString typeString() const; - virtual QCString argsString() const; - virtual QCString excpString() const; - virtual QCString bitfieldString() const; - virtual QCString extraTypeChars() const; - virtual const QCString &initializer() const; - virtual int initializerLines() const; - virtual uint64_t getMemberSpecifiers() const; - virtual const MemberList *getSectionList(const Definition *) const; - virtual QCString displayDefinition() const; - virtual const ClassDef *getClassDef() const; - virtual ClassDef *getClassDef(); - virtual const FileDef *getFileDef() const; - virtual FileDef *getFileDef(); - virtual const NamespaceDef* getNamespaceDef() const; - virtual NamespaceDef* getNamespaceDef(); - virtual const GroupDef *getGroupDef() const; - virtual ClassDef *accessorClass() const; - virtual QCString getReadAccessor() const; - virtual QCString getWriteAccessor() const; - virtual Grouping::GroupPri_t getGroupPri() const; - virtual QCString getGroupFileName() const; - virtual int getGroupStartLine() const; - virtual bool getGroupHasDocs() const; - virtual QCString qualifiedName() const; - virtual QCString objCMethodName(bool localLink,bool showStatic) const; - virtual Protection protection() const; - virtual Specifier virtualness(int count=0) const; - virtual MemberType memberType() const; - virtual QCString memberTypeName() const; - virtual bool isSignal() const; - virtual bool isSlot() const; - virtual bool isVariable() const; - virtual bool isEnumerate() const; - virtual bool isEnumValue() const; - virtual bool isTypedef() const; - virtual bool isSequence() const; - virtual bool isDictionary() const; - virtual bool isFunction() const; - virtual bool isFunctionPtr() const; - virtual bool isDefine() const; - virtual bool isFriend() const; - virtual bool isDCOP() const; - virtual bool isProperty() const; - virtual bool isEvent() const; - virtual bool isRelated() const; - virtual bool isForeign() const; - virtual bool isStatic() const; - virtual bool isInline() const; - virtual bool isExplicit() const; - virtual bool isMutable() const; - virtual bool isGettable() const; - virtual bool isPrivateGettable() const; - virtual bool isProtectedGettable() const; - virtual bool isSettable() const; - virtual bool isPrivateSettable() const; - virtual bool isProtectedSettable() const; - virtual bool isReadable() const; - virtual bool isWritable() const; - virtual bool isAddable() const; - virtual bool isRemovable() const; - virtual bool isRaisable() const; - virtual bool isFinal() const; - virtual bool isAbstract() const; - virtual bool isOverride() const; - virtual bool isInitonly() const; - virtual bool isOptional() const; - virtual bool isRequired() const; - virtual bool isNonAtomic() const; - virtual bool isCopy() const; - virtual bool isAssign() const; - virtual bool isRetain() const; - virtual bool isWeak() const; - virtual bool isStrong() const; - virtual bool isEnumStruct() const; - virtual bool isUnretained() const; - virtual bool isNew() const; - virtual bool isSealed() const; - virtual bool isImplementation() const; - virtual bool isExternal() const; - virtual bool isTypeAlias() const; - virtual bool isDefault() const; - virtual bool isDelete() const; - virtual bool isNoExcept() const; - virtual bool isAttribute() const; - virtual bool isUNOProperty() const; - virtual bool isReadonly() const; - virtual bool isBound() const; - virtual bool isConstrained() const; - virtual bool isTransient() const; - virtual bool isMaybeVoid() const; - virtual bool isMaybeDefault() const; - virtual bool isMaybeAmbiguous() const; - virtual bool isPublished() const; - virtual bool isTemplateSpecialization() const; - virtual bool isObjCMethod() const; - virtual bool isObjCProperty() const; - virtual bool isCSharpProperty() const; - virtual bool isConstructor() const; - virtual bool isDestructor() const; - virtual bool hasOneLineInitializer() const; - virtual bool hasMultiLineInitializer() const; - virtual bool isCallable() const; - virtual bool isStrongEnumValue() const; - virtual bool livesInsideEnum() const; - virtual bool isSliceLocal() const; - virtual bool isConstExpr() const; - virtual int numberOfFlowKeyWords() const; - virtual bool isFriendToHide() const; - virtual bool isNotFriend() const; - virtual bool isFunctionOrSignalSlot() const; - virtual bool isRelatedOrFriend() const; - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual bool hasDocumentation() const; - virtual bool isDeleted() const; - virtual bool isBriefSectionVisible() const; - virtual bool isDetailedSectionVisible(MemberListContainer container) const; - virtual bool hasDetailedDescription() const; - virtual bool isFriendClass() const; - virtual bool isDocumentedFriendClass() const; - virtual const MemberDef *reimplements() const; - virtual const MemberVector &reimplementedBy() const; - virtual bool isReimplementedBy(const ClassDef *cd) const; - virtual ClassDef *relatedAlso() const; - virtual bool hasDocumentedEnumValues() const; - virtual const MemberDef *getAnonymousEnumType() const; - virtual bool isDocsForDefinition() const; - virtual const MemberDef *getEnumScope() const; - virtual const MemberVector &enumFieldList() const; - virtual void setEnumBaseType(const QCString &type); - virtual QCString enumBaseType() const; - virtual bool hasExamples() const; - virtual const ExampleList &getExamples() const; - virtual bool isPrototype() const; - virtual const ArgumentList &argumentList() const; - virtual ArgumentList &argumentList(); - virtual const ArgumentList &declArgumentList() const; - virtual const ArgumentList &templateArguments() const; - virtual const ArgumentLists &definitionTemplateParameterLists() const; - virtual int getMemberGroupId() const; - virtual MemberGroup *getMemberGroup() const; - virtual bool fromAnonymousScope() const; - virtual MemberDef *fromAnonymousMember() const; - virtual bool hasCallGraph() const; - virtual bool hasCallerGraph() const; - virtual bool hasReferencesRelation() const; - virtual bool hasReferencedByRelation() const; - virtual const MemberDef *templateMaster() const; - virtual QCString getScopeString() const; - virtual ClassDef *getClassDefOfAnonymousType() const; - virtual bool isTypedefValCached() const; - virtual const ClassDef *getCachedTypedefVal() const; - virtual QCString getCachedTypedefTemplSpec() const; - virtual QCString getCachedResolvedTypedef() const; - virtual MemberDef *memberDefinition() const; - virtual MemberDef *memberDeclaration() const; - virtual const MemberDef *inheritsDocsFrom() const; - virtual const MemberDef *getGroupAlias() const; - virtual ClassDef *category() const; - virtual const MemberDef *categoryRelation() const; - virtual QCString displayName(bool=TRUE) const; - virtual QCString getDeclType() const; - virtual StringVector getLabels(const Definition *container) const; - virtual const ArgumentList &typeConstraints() const; - virtual QCString requiresClause() const; - virtual QCString documentation() const; - virtual QCString briefDescription(bool abbr=FALSE) const; - virtual QCString fieldType() const; - virtual bool isReference() const; - virtual QCString getDeclFileName() const; - virtual int getDeclLine() const; - virtual int getDeclColumn() const; - virtual void setMemberType(MemberType t); - virtual void setDefinition(const QCString &d); - virtual void setFileDef(FileDef *fd); - virtual void setAnchor(); - virtual void setProtection(Protection p); - virtual void setMemberSpecifiers(uint64_t s); - virtual void mergeMemberSpecifiers(uint64_t s); - virtual void setInitializer(const QCString &i); - virtual void setBitfields(const QCString &s); - virtual void setMaxInitLines(int lines); - virtual void setMemberClass(ClassDef *cd); - virtual void setSectionList(const Definition *container,const MemberList *sl); + 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 uint64_t getMemberSpecifiers() 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 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 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(uint64_t s) override; + virtual void mergeMemberSpecifiers(uint64_t 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, const QCString &fileName,int startLine,bool hasDocs, - MemberDef *member=0); - virtual void setReadAccessor(const QCString &r); - virtual void setWriteAccessor(const QCString &w); - virtual void setTemplateSpecialization(bool b); - virtual void makeRelated(); - virtual void makeForeign(); - virtual void setInheritsDocsFrom(const MemberDef *md); - virtual void setTagInfo(const TagInfo *i); - virtual void setArgsString(const QCString &as); - virtual void setReimplements(MemberDef *md); - virtual void insertReimplementedBy(MemberDef *md); - virtual void setRelatedAlso(ClassDef *cd); - virtual void insertEnumField(MemberDef *md); - virtual void setEnumScope(const MemberDef *md,bool livesInsideEnum=FALSE); - virtual void setEnumClassScope(ClassDef *cd); - virtual void setDocumentedEnumValues(bool value); - virtual void setAnonymousEnumType(const MemberDef *md); - virtual bool addExample(const QCString &anchor,const QCString &name,const QCString &file); - virtual void setPrototype(bool p,const QCString &df,int line, int column); - virtual void setExplicitExternal(bool b,const QCString &df,int line,int column); - virtual void setDeclFile(const QCString &df,int line,int column); - virtual void moveArgumentList(std::unique_ptr al); - virtual void moveDeclArgumentList(std::unique_ptr al); - virtual void setDefinitionTemplateParameterLists(const ArgumentLists &lists); - virtual void setTypeConstraints(const ArgumentList &al); - virtual void setType(const QCString &t); - virtual void setAccessorType(ClassDef *cd,const QCString &t); - virtual void setNamespace(NamespaceDef *nd); - virtual void setMemberGroup(MemberGroup *grp); - virtual void setMemberGroupId(int id); - virtual void makeImplementationDetail(); - virtual void setFromAnonymousScope(bool b); - virtual void setFromAnonymousMember(MemberDef *m); - virtual void enableCallGraph(bool e); - virtual void enableCallerGraph(bool e); - virtual void enableReferencedByRelation(bool e); - virtual void enableReferencesRelation(bool e); - virtual void setTemplateMaster(MemberDef *mt); - virtual void addListReference(Definition *d); - virtual void setDocsForDefinition(bool b); - virtual void setGroupAlias(const MemberDef *md); - virtual void cacheTypedefVal(const ClassDef *val,const QCString &templSpec,const QCString &resolvedType); - virtual void invalidateTypedefValCache(); - virtual void invalidateCachedArgumentTypes(); - virtual void setMemberDefinition(MemberDef *md); - virtual void setMemberDeclaration(MemberDef *md); - virtual void copyArgumentNames(const MemberDef *bmd); - virtual void setCategory(ClassDef *); - virtual void setCategoryRelation(const MemberDef *); - virtual void setDocumentation(const QCString &d,const QCString &docFile,int docLine,bool stripWhiteSpace=TRUE); - virtual void setBriefDescription(const QCString &b,const QCString &briefFile,int briefLine); - virtual void setInbodyDocumentation(const QCString &d,const QCString &inbodyFile,int inbodyLine); - virtual void setHidden(bool b); - virtual void setRequiresClause(const QCString &req); - virtual void incrementFlowKeyWordCount(); + 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 enableCallerGraph(bool e) override; + virtual void enableReferencedByRelation(bool e) override; + virtual void enableReferencesRelation(bool e) 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, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd, - 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; virtual 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; - virtual void writeMemberDocSimple(OutputList &ol,const Definition *container) const; + showInline=FALSE) const override; + virtual void writeMemberDocSimple(OutputList &ol,const Definition *container) const override; virtual void writeEnumDeclaration(OutputList &typeDecl, - const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd) const; - virtual void writeTagFile(TextStream &,bool useQualifiedName,bool showNamespaceMembers) const; - virtual void warnIfUndocumented() const; - virtual void warnIfUndocumentedParams() const; - virtual bool visibleInIndex() const; - virtual void detectUndocumentedParams(bool hasParamCommand,bool hasReturnCommand) const; + const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd) 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, - const std::unique_ptr &actualArgs) const; - virtual void findSectionsInDocumentation(); + const std::unique_ptr &actualArgs) const override; + virtual void findSectionsInDocumentation() override; virtual void writeLink(OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd, - bool onlyText=FALSE) const; - virtual void resolveUnnamedParameters(const MemberDef *md); - virtual void addQualifiers(const StringVector &qualifiers); - virtual StringVector getQualifiers() const; - virtual ClassDefMutable *getClassDefMutable(); + 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; private: void _computeLinkableInProject(); @@ -5377,11 +5376,6 @@ const ArgumentList &MemberDefImpl::argumentList() const return m_defArgList; } -ArgumentList &MemberDefImpl::argumentList() -{ - return m_defArgList; -} - const ArgumentList &MemberDefImpl::declArgumentList() const { return m_declArgList; diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index e3dc820e4e7..50f757d5d8e 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -57,63 +57,64 @@ class NamespaceDefImpl : public DefinitionMixin const QCString &refFile=QCString(),const QCString &type=QCString(), bool isPublished=false); virtual ~NamespaceDefImpl(); - virtual DefType definitionType() const { return TypeNamespace; } - virtual CodeSymbolType codeSymbolType() const + virtual DefType definitionType() const override { return TypeNamespace; } + virtual CodeSymbolType codeSymbolType() const override { return getLanguage()==SrcLangExt_Java ? CodeSymbolType::Package : CodeSymbolType::Namespace; } - virtual QCString getOutputFileBase() const; - virtual QCString anchor() const { return QCString(); } - virtual void insertUsedFile(FileDef *fd); - virtual void writeDocumentation(OutputList &ol); - virtual void writeMemberPages(OutputList &ol); - virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const; - virtual void writeTagFile(TextStream &); - virtual void insertClass(ClassDef *cd); - virtual void insertConcept(ConceptDef *cd); - virtual void insertNamespace(NamespaceDef *nd); - virtual void insertMember(MemberDef *md); - virtual void computeAnchors(); - virtual void countMembers(); - virtual int numDocMembers() const; - virtual void addUsingDirective(NamespaceDef *nd); - virtual const LinkedRefMap &getUsedNamespaces() const { return m_usingDirList; } - virtual void addUsingDeclaration(ClassDef *cd); - virtual const LinkedRefMap &getUsedClasses() const { return m_usingDeclList; } - virtual void combineUsingRelations(NamespaceDefSet &visitedNamespace); - virtual QCString displayName(bool=TRUE) const; - virtual void setInline(bool isInline) { m_inline = isInline; } - virtual bool isConstantGroup() const { return CONSTANT_GROUP == m_type; } - virtual bool isModule() const { return NAMESPACE == m_type || MODULE == m_type; } - virtual bool isLibrary() const { return LIBRARY == m_type; } - virtual bool isInline() const { return m_inline; } - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual bool hasDetailedDescription() const; - virtual void addMembersToMemberGroup(); - virtual void distributeMemberGroupDocumentation(); - virtual void findSectionsInDocumentation(); - virtual void sortMemberLists(); - virtual const Definition *findInnerCompound(const QCString &name) const; - virtual void addInnerCompound(Definition *d); - virtual void addListReferences(); - virtual void setFileName(const QCString &fn); - virtual bool subGrouping() const { return m_subGrouping; } - virtual MemberList *getMemberList(MemberListType lt) const; - virtual const MemberLists &getMemberLists() const { return m_memberLists; } - virtual const MemberDef *getMemberByName(const QCString &) const; - virtual const MemberGroupList &getMemberGroups() const { return m_memberGroups; } - virtual ClassLinkedRefMap getClasses() const { return classes; } - virtual ClassLinkedRefMap getInterfaces() const { return interfaces; } - virtual ClassLinkedRefMap getStructs() const { return structs; } - virtual ClassLinkedRefMap getExceptions() const { return exceptions; } - virtual NamespaceLinkedRefMap getNamespaces() const { return namespaces; } - virtual ConceptLinkedRefMap getConcepts() const { return m_concepts; } - virtual void setName(const QCString &name); - - virtual QCString title() const; - virtual QCString compoundTypeString() const; - - virtual void setMetaData(const QCString &m); - virtual int countVisibleMembers() const; + 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 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; private: void addMemberToList(MemberListType lt,MemberDef *md); @@ -130,7 +131,6 @@ class NamespaceDefImpl : public DefinitionMixin void writeAuthorSection(OutputList &ol); void startMemberDocumentation(OutputList &ol); void endMemberDocumentation(OutputList &ol); - void writeSummaryLinks(OutputList &ol) const; void addNamespaceAttributes(OutputList &ol); void writeClassesToTagFile(TextStream &,const ClassLinkedRefMap &d); void writeConceptsToTagFile(TextStream &); diff --git a/src/pagedef.cpp b/src/pagedef.cpp index 426902d472e..399ab87af88 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -33,35 +33,35 @@ class PageDefImpl : public DefinitionMixin PageDefImpl(const QCString &f,int l,const QCString &n,const QCString &d,const QCString &t); virtual ~PageDefImpl(); - virtual void setFileName(const QCString &name); - virtual void setLocalToc(const LocalToc &tl); - virtual void setShowLineNo(bool); - virtual DefType definitionType() const { return TypePage; } - virtual CodeSymbolType codeSymbolType() const { return CodeSymbolType::Default; } - virtual bool isLinkableInProject() const { return /*hasDocumentation() &&*/ !isReference(); } - virtual bool isLinkable() const { return isLinkableInProject() || isReference(); } - virtual QCString getOutputFileBase() const; - virtual QCString anchor() const { return QCString(); } - virtual void findSectionsInDocumentation(); - virtual QCString title() const { return m_title; } - virtual const GroupDef * getGroupDef() const; - virtual const PageLinkedRefMap &getSubPages() const { return m_subPages; } - virtual void addInnerCompound(Definition *d); - virtual bool visibleInIndex() const; - virtual bool documentedPage() const; - virtual bool hasSubPages() const; - virtual bool hasParentPage() const; - virtual bool hasTitle() const; - virtual LocalToc localToc() const { return m_localToc; } - virtual void setPageScope(Definition *d){ m_pageScope = d; } - virtual Definition *getPageScope() const { return m_pageScope; } - virtual QCString displayName(bool=TRUE) const { return hasTitle() ? m_title : DefinitionMixin::name(); } - virtual bool showLineNo() const; - virtual void setTitle(const QCString &title); - virtual void writeDocumentation(OutputList &ol); - virtual void writeTagFile(TextStream &); - virtual void setNestingLevel(int l); - virtual void writePageDocumentation(OutputList &ol) const; + 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; private: QCString m_fileName;