Merge branch 'master' of github.com:doxygen/doxygen

doxygen · Nov 25, 2023 · 2e76970 · 2e76970
2 parents 332323e + 3afe810
commit 2e76970
Show file tree

Hide file tree

Showing 10 changed files with 1,253 additions and 1,253 deletions.
diff --git a/src/classdef.cpp b/src/classdef.cpp
diff --git a/src/conceptdef.cpp b/src/conceptdef.cpp
@@ -38,36 +38,36 @@ class ConceptDefImpl : public DefinitionMixin<ConceptDefMutable>
     ConceptDef *resolveAlias() { return this; }
 
     //---------- ConceptDef
-    virtual DefType definitionType() const override;
-    virtual CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Concept; }
-    virtual QCString getOutputFileBase() const override;
-    virtual bool hasDetailedDescription() const override;
-    virtual QCString displayName(bool includeScope=true) const override;
-    virtual const IncludeInfo *includeInfo() const override;
-    virtual ArgumentList getTemplateParameterList() const override;
-    virtual QCString anchor() const override;
-    virtual bool isLinkableInProject() const override;
-    virtual bool isLinkable() const override;
-    virtual QCString initializer() const override;
-    virtual void writeDeclarationLink(OutputList &ol,bool &found,
+    DefType definitionType() const override;
+    CodeSymbolType codeSymbolType() const override { return CodeSymbolType::Concept; }
+    QCString getOutputFileBase() const override;
+    bool hasDetailedDescription() const override;
+    QCString displayName(bool includeScope=true) const override;
+    const IncludeInfo *includeInfo() const override;
+    ArgumentList getTemplateParameterList() const override;
+    QCString anchor() const override;
+    bool isLinkableInProject() const override;
+    bool isLinkable() const override;
+    QCString initializer() const override;
+    void writeDeclarationLink(OutputList &ol,bool &found,
                               const QCString &header,bool localNames) const override;
-    virtual const NamespaceDef *getNamespaceDef() const override;
-    virtual const FileDef *getFileDef() const override;
-    virtual const ModuleDef *getModuleDef() const override;
-    virtual QCString title() const override;
-    virtual int groupId() const override;
+    const NamespaceDef *getNamespaceDef() const override;
+    const FileDef *getFileDef() const override;
+    const ModuleDef *getModuleDef() const override;
+    QCString title() const override;
+    int groupId() const override;
 
     //---------- ConceptDefMutable
-    virtual void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override;
-    virtual void setTemplateArguments(const ArgumentList &al) override;
-    virtual void setNamespace(NamespaceDef *nd) override;
-    virtual void setFileDef(FileDef *fd) override;
-    virtual void setModuleDef(ModuleDef *mod) override;
-    virtual void writeTagFile(TextStream &) override;
-    virtual void writeDocumentation(OutputList &) override;
-    virtual void setInitializer(const QCString &init) override;
-    virtual void findSectionsInDocumentation() override;
-    virtual void setGroupId(int id) override;
+    void setIncludeFile(FileDef *fd,const QCString &incName,bool local,bool force) override;
+    void setTemplateArguments(const ArgumentList &al) override;
+    void setNamespace(NamespaceDef *nd) override;
+    void setFileDef(FileDef *fd) override;
+    void setModuleDef(ModuleDef *mod) override;
+    void writeTagFile(TextStream &) override;
+    void writeDocumentation(OutputList &) override;
+    void setInitializer(const QCString &init) override;
+    void findSectionsInDocumentation() override;
+    void setGroupId(int id) override;
 
     //---------- Helpers
     void writeBriefDescription(OutputList &) const;
@@ -102,48 +102,48 @@ class ConceptDefAliasImpl : public DefinitionAliasMixin<ConceptDef>
   public:
     ConceptDefAliasImpl(const Definition *newScope,const ConceptDef *cd)
       : DefinitionAliasMixin(newScope,cd) { init(); }
-    virtual ~ConceptDefAliasImpl() { deinit(); }
+    ~ConceptDefAliasImpl() override { deinit(); }
 
     const ConceptDef *getCdAlias() const { return toConceptDef(getAlias()); }
-    virtual ConceptDef *resolveAlias() { return const_cast<ConceptDef*>(getCdAlias()); }
+    ConceptDef *resolveAlias() { return const_cast<ConceptDef*>(getCdAlias()); }
 
-    virtual DefType definitionType() const { return TypeConcept; }
-    virtual CodeSymbolType codeSymbolType() const
+    DefType definitionType() const override { return TypeConcept; }
+    CodeSymbolType codeSymbolType() const override
     { return getCdAlias()->codeSymbolType(); }
-    virtual QCString getOutputFileBase() const
+    QCString getOutputFileBase() const override
     { return getCdAlias()->getOutputFileBase(); }
-    virtual QCString getReference() const
+    QCString getReference() const override
     { return getCdAlias()->getReference(); }
-    virtual bool isReference() const
+    bool isReference() const override
     { return getCdAlias()->isReference(); }
-    virtual bool hasDetailedDescription() const
+    bool hasDetailedDescription() const override
     { return getCdAlias()->hasDetailedDescription(); }
-    virtual QCString displayName(bool includeScope=true) const
+    QCString displayName(bool includeScope=true) const override
     { return getCdAlias()->displayName(includeScope); }
-    virtual const IncludeInfo *includeInfo() const
+    const IncludeInfo *includeInfo() const override
     { return getCdAlias()->includeInfo(); }
-    virtual ArgumentList getTemplateParameterList() const
+    ArgumentList getTemplateParameterList() const override
     { return getCdAlias()->getTemplateParameterList(); }
-    virtual QCString anchor() const
+    QCString anchor() const override
     { return getCdAlias()->anchor(); }
-    virtual bool isLinkableInProject() const
+    bool isLinkableInProject() const override
     { return getCdAlias()->isLinkableInProject(); }
-    virtual bool isLinkable() const
+    bool isLinkable() const override
     { return getCdAlias()->isLinkable(); }
-    virtual QCString initializer() const
+    QCString initializer() const override
     { return getCdAlias()->initializer(); }
-    virtual const NamespaceDef *getNamespaceDef() const
+    const NamespaceDef *getNamespaceDef() const override
     { return getCdAlias()->getNamespaceDef(); }
-    virtual const FileDef *getFileDef() const
+    const FileDef *getFileDef() const override
     { return getCdAlias()->getFileDef(); }
-    virtual const ModuleDef *getModuleDef() const
+    const ModuleDef *getModuleDef() const override
     { return getCdAlias()->getModuleDef(); }
-    virtual QCString title() const
+    QCString title() const override
     { return getCdAlias()->title(); }
-    virtual void writeDeclarationLink(OutputList &ol,bool &found,
-                              const QCString &header,bool localNames) const
+    void writeDeclarationLink(OutputList &ol,bool &found,
+                              const QCString &header,bool localNames) const override
     { getCdAlias()->writeDeclarationLink(ol,found,header,localNames); }
-    virtual int groupId() const
+    int groupId() const override
     { return getCdAlias()->groupId(); }
 };