Refactoring: add missing overrides

Found using clang-tidy's modernize-use-override check

libxml/xml.h

@@ -77,7 +77,7 @@ class XMLParser : public XMLLocator
      */
     XMLParser(const XMLHandlers &handlers);
     /*! Destructor */
-   ~XMLParser();
+   ~XMLParser() override;
     XMLParser(const XMLParser &) = delete;
     XMLParser &operator=(const XMLParser &) = delete;
     XMLParser(XMLParser &&) = delete;
@@ -103,8 +103,8 @@ class XMLParser : public XMLLocator
               );
 
   private:
-   virtual int lineNr() const override;
-   virtual std::string fileName() const override;
+   int lineNr() const override;
+   std::string fileName() const override;
    struct Private;
    std::unique_ptr<Private> p;
 };

src/cite.cpp

@@ -49,8 +49,8 @@ class CiteInfoImpl : public CiteInfo
     CiteInfoImpl(const QCString &label, const QCString &text=QCString())
     : m_label(label), m_text(text) { }
 
-    virtual QCString label()    const { return m_label;    }
-    virtual QCString text()     const { return m_text;     }
+    QCString label() const override { return m_label;    }
+    QCString text()  const override { return m_text;     }
 
     void setText(const QCString &s) { m_text = s; }
 

src/classdef.h

@@ -121,31 +121,14 @@ class ClassDef : public Definition
     // --- getters
     //-----------------------------------------------------------------------------------
 
-    /** Used for RTTI, this is a class */
-    virtual DefType definitionType() const = 0;
-
-    /** Returns the unique base name (without extension) of the class's file on disk */
-    virtual QCString getOutputFileBase() const = 0;
     virtual QCString getInstanceOutputFileBase() const = 0;
 
-    /** Returns the base name for the source code file */
-    virtual QCString getSourceFileBase() const = 0;
-
-    /** If this class originated from a tagfile, this will return the tag file reference */
-    virtual QCString getReference() const = 0;
-
-    /** Returns TRUE if this class is imported via a tag file */
-    virtual bool isReference() const = 0;
-
     /** Returns TRUE if this is a local class definition, see EXTRACT_LOCAL_CLASSES */
     virtual bool isLocal() const = 0;
 
     /** returns the classes nested into this class */
     virtual ClassLinkedRefMap getClasses() const = 0;
 
-    /** returns TRUE if this class has documentation */
-    virtual bool hasDocumentation() const = 0;
-
     /** returns TRUE if this class has a non-empty detailed description */
     virtual bool hasDetailedDescription() const = 0;
 
@@ -155,9 +138,6 @@ class ClassDef : public Definition
     /** returns the file name to use for the inheritance graph */
     virtual QCString inheritanceGraphFileName() const = 0;
 
-    /** Returns the name as it is appears in the documentation */
-    virtual QCString displayName(bool includeScope=TRUE) const = 0;
-
     /** Returns the type of compound this is, i.e. class/struct/union/.. */
     virtual CompoundType compoundType() const = 0;
 
@@ -189,15 +169,6 @@ class ClassDef : public Definition
      */
     virtual Protection protection() const = 0;
 
-    /** returns TRUE iff a link is possible to this item within this project.
-     */
-    virtual bool isLinkableInProject() const = 0;
-
-    /** return TRUE iff a link to this class is possible (either within
-     *  this project, or as a cross-reference to another project).
-     */
-    virtual bool isLinkable() const = 0;
-
     /** the class is visible in a class diagram, or class hierarchy */
     virtual bool isVisibleInHierarchy() const = 0;
 
@@ -264,12 +235,6 @@ class ClassDef : public Definition
 
     virtual bool isTemplateArgument() const = 0;
 
-    /** Returns the definition of a nested compound if
-     *  available, or 0 otherwise.
-     *  @param name The name of the nested compound
-     */
-    virtual const Definition *findInnerCompound(const QCString &name) const = 0;
-
     /** Returns the template parameter lists that form the template
      *  declaration of this class.
      *
@@ -335,7 +300,6 @@ class ClassDef : public Definition
 
     virtual bool isUsedOnly() const = 0;
 
-    virtual QCString anchor() const = 0;
     virtual bool isEmbeddedInOuterScope() const = 0;
 
     virtual bool isSimple() const = 0;
@@ -453,7 +417,6 @@ class ClassDefMutable : public DefinitionMutable, public ClassDef
     virtual void insertMember(MemberDef *) = 0;
     virtual void insertUsedFile(const FileDef *) = 0;
     virtual void addMembersToTemplateInstance(const ClassDef *cd,const ArgumentList &templateArguments,const QCString &templSpec) = 0;
-    virtual void addInnerCompound(Definition *d) = 0;
     virtual bool addExample(const QCString &anchor,const QCString &name, const QCString &file) = 0;
     virtual void addUsedClass(ClassDef *cd,const QCString &accessName,Protection prot) = 0;
     virtual void addUsedByClass(ClassDef *cd,const QCString &accessName,Protection prot) = 0;

src/code.h

@@ -30,7 +30,7 @@ class CCodeParser : public CodeParserInterface
 {
   public:
     CCodeParser();
-    virtual ~CCodeParser();
+   ~CCodeParser() override;
     NON_COPYABLE(CCodeParser)
     void parseCode(OutputCodeList &codeOutIntf,
                    const QCString &scopeName,
@@ -46,8 +46,8 @@ class CCodeParser : public CodeParserInterface
                    bool showLineNumbers=TRUE,
                    const Definition *searchCtx=nullptr,
                    bool collectXRefs=TRUE
-                  );
-    void resetCodeParserState();
+                  ) override;
+    void resetCodeParserState() override;
     void setInsideCodeLine(bool inp);
     bool insideCodeLine() const;
   private:

src/conceptdef.cpp

@@ -33,7 +33,7 @@ class ConceptDefImpl : public DefinitionMixin<ConceptDefMutable>
   public:
     ConceptDefImpl(const QCString &fileName,int startLine,int startColumn,
                    const QCString &name,const QCString &tagRef=QCString(),const QCString &tagFile=QCString());
-   ~ConceptDefImpl();
+   ~ConceptDefImpl() override;
     NON_COPYABLE(ConceptDefImpl);
 
     ConceptDef *resolveAlias() { return this; }

src/conceptdef.h

@@ -28,15 +28,9 @@ class ConceptDef : public Definition
   public:
     ABSTRACT_BASE_CLASS(ConceptDef)
 
-    virtual DefType definitionType() const = 0;
-    virtual QCString getOutputFileBase() const = 0;
     virtual bool hasDetailedDescription() const = 0;
-    virtual QCString displayName(bool includeScope=true) const = 0;
     virtual const IncludeInfo *includeInfo() const = 0;
     virtual ArgumentList getTemplateParameterList() const = 0;
-    virtual QCString anchor() const = 0;
-    virtual bool isLinkableInProject() const = 0;
-    virtual bool isLinkable() const = 0;
     virtual QCString initializer() const = 0;
     virtual void writeDeclarationLink(OutputList &ol,bool &found,
                               const QCString &header,bool localNames) const = 0;

src/configimpl.h

@@ -111,11 +111,11 @@ class ConfigInfo : public ConfigOption
       m_name = name;
       m_doc = doc;
     }
-    void writeTemplate(TextStream &t, bool sl,bool);
-    void compareDoxyfile(TextStream &,Config::CompareMode) {}
-    void writeXMLDoxyfile(TextStream &) {}
-    void writeXSDDoxyfile(TextStream &t) {}
-    void substEnvVars() {}
+    void writeTemplate(TextStream &t, bool sl,bool) override;
+    void compareDoxyfile(TextStream &,Config::CompareMode) override {}
+    void writeXMLDoxyfile(TextStream &) override {}
+    void writeXSDDoxyfile(TextStream &t) override {}
+    void substEnvVars() override {}
 };
 
 /** Class representing a list type option.
@@ -136,14 +136,14 @@ class ConfigList : public ConfigOption
     WidgetType widgetType() const { return m_widgetType; }
     StringVector *valueRef() { return &m_value; }
     StringVector getDefault() { return m_defaultValue; }
-    void emptyValueToDefault() { if (m_value.empty() && !m_defaultValue.empty()) m_value=m_defaultValue; };
-    void writeTemplate(TextStream &t,bool sl,bool);
-    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode);
-    void writeXMLDoxyfile(TextStream &t);
-    void writeXSDDoxyfile(TextStream &t);
-    void substEnvVars();
-    void init() { m_value = m_defaultValue; }
-    bool isDefault();
+    void emptyValueToDefault() override { if (m_value.empty() && !m_defaultValue.empty()) m_value=m_defaultValue; };
+    void writeTemplate(TextStream &t,bool sl,bool) override;
+    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
+    void writeXMLDoxyfile(TextStream &t) override;
+    void writeXSDDoxyfile(TextStream &t) override;
+    void substEnvVars() override;
+    void init() override { m_value = m_defaultValue; }
+    bool isDefault() override;
   private:
     StringVector m_value;
     StringVector m_defaultValue;
@@ -166,14 +166,14 @@ class ConfigEnum : public ConfigOption
     void addValue(const char *v) { m_valueRange.emplace_back(v); }
     const std::vector<QCString> &values() const { return m_valueRange; }
     QCString *valueRef() { return &m_value; }
-    void substEnvVars();
-    void writeTemplate(TextStream &t,bool sl,bool);
-    void convertStrToVal(Config::CompareMode compareMode);
-    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode);
-    void writeXMLDoxyfile(TextStream &t);
-    void writeXSDDoxyfile(TextStream &t);
-    void init() { m_value = m_defValue; }
-    bool isDefault() { return m_value == m_defValue; }
+    void substEnvVars() override;
+    void writeTemplate(TextStream &t,bool sl,bool) override;
+    void convertStrToVal(Config::CompareMode compareMode) override;
+    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
+    void writeXMLDoxyfile(TextStream &t) override;
+    void writeXSDDoxyfile(TextStream &t) override;
+    void init() override { m_value = m_defValue; }
+    bool isDefault() override { return m_value == m_defValue; }
 
   private:
     std::vector<QCString> m_valueRange;
@@ -198,14 +198,14 @@ class ConfigString : public ConfigOption
     WidgetType widgetType() const { return m_widgetType; }
     void setDefaultValue(const char *v) { m_defValue = v; }
     QCString *valueRef() { return &m_value; }
-    void writeTemplate(TextStream &t,bool sl,bool);
-    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode);
-    void writeXMLDoxyfile(TextStream &t);
-    void writeXSDDoxyfile(TextStream &t);
-    void substEnvVars();
-    void init() { m_value = m_defValue; }
-    void emptyValueToDefault() { if (m_value.isEmpty()) m_value=m_defValue; };
-    bool isDefault() { return m_value.stripWhiteSpace() == m_defValue.stripWhiteSpace(); }
+    void writeTemplate(TextStream &t,bool sl,bool) override;
+    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
+    void writeXMLDoxyfile(TextStream &t) override;
+    void writeXSDDoxyfile(TextStream &t) override;
+    void substEnvVars() override;
+    void init() override { m_value = m_defValue; }
+    void emptyValueToDefault() override { if (m_value.isEmpty()) m_value=m_defValue; };
+    bool isDefault() override { return m_value.stripWhiteSpace() == m_defValue.stripWhiteSpace(); }
 
   private:
     QCString m_value;
@@ -232,14 +232,14 @@ class ConfigInt : public ConfigOption
     int *valueRef() { return &m_value; }
     int minVal() const { return m_minVal; }
     int maxVal() const { return m_maxVal; }
-    void convertStrToVal(Config::CompareMode compareMode);
-    void substEnvVars();
-    void writeTemplate(TextStream &t,bool sl,bool upd);
-    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode);
-    void writeXMLDoxyfile(TextStream &t);
-    void writeXSDDoxyfile(TextStream &t);
-    void init() { m_value = m_defValue; }
-    bool isDefault() { return m_value == m_defValue; }
+    void convertStrToVal(Config::CompareMode compareMode) override;
+    void substEnvVars() override;
+    void writeTemplate(TextStream &t,bool sl,bool upd) override;
+    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
+    void writeXMLDoxyfile(TextStream &t) override;
+    void writeXSDDoxyfile(TextStream &t) override;
+    void init() override { m_value = m_defValue; }
+    bool isDefault() override { return m_value == m_defValue; }
   private:
     int m_value;
     int m_defValue;
@@ -263,15 +263,15 @@ class ConfigBool : public ConfigOption
     }
     QCString *valueStringRef() { return &m_valueString; }
     bool *valueRef() { return &m_value; }
-    void convertStrToVal(Config::CompareMode compareMode);
-    void substEnvVars();
+    void convertStrToVal(Config::CompareMode compareMode) override;
+    void substEnvVars() override;
     void setValueString(const QCString &v) { m_valueString = v; }
-    void writeTemplate(TextStream &t,bool sl,bool upd);
-    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode);
-    void writeXMLDoxyfile(TextStream &t);
-    void writeXSDDoxyfile(TextStream &t);
-    void init() { m_value = m_defValue; }
-    bool isDefault() { return m_value == m_defValue; }
+    void writeTemplate(TextStream &t,bool sl,bool upd) override;
+    void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
+    void writeXMLDoxyfile(TextStream &t) override;
+    void writeXSDDoxyfile(TextStream &t) override;
+    void init() override { m_value = m_defValue; }
+    bool isDefault() override { return m_value == m_defValue; }
   private:
     bool m_value;
     bool m_defValue;
@@ -285,11 +285,11 @@ class ConfigObsolete : public ConfigOption
   public:
     ConfigObsolete(const char *name,OptionType orgType) : ConfigOption(O_Obsolete), m_orgType(orgType)
     { m_name = name; }
-    void writeTemplate(TextStream &,bool,bool);
-    void compareDoxyfile(TextStream &,Config::CompareMode) {}
-    void writeXMLDoxyfile(TextStream &) {}
-    void writeXSDDoxyfile(TextStream &) {}
-    void substEnvVars() {}
+    void writeTemplate(TextStream &,bool,bool) override;
+    void compareDoxyfile(TextStream &,Config::CompareMode) override {}
+    void writeXMLDoxyfile(TextStream &) override {}
+    void writeXSDDoxyfile(TextStream &) override {}
+    void substEnvVars() override {}
     OptionType orgType() const { return m_orgType; }
     StringVector *valueListRef() { return &m_listvalue; }
     QCString *valueStringRef() { return &m_valueString; }
@@ -309,11 +309,11 @@ class ConfigDisabled : public ConfigOption
   public:
     ConfigDisabled(const char *name) : ConfigOption(O_Disabled)
     { m_name = name; }
-    void writeTemplate(TextStream &,bool,bool);
-    void compareDoxyfile(TextStream &,Config::CompareMode) {}
-    void writeXMLDoxyfile(TextStream &) {}
-    void writeXSDDoxyfile(TextStream &);
-    void substEnvVars() {}
+    void writeTemplate(TextStream &,bool,bool) override;
+    void compareDoxyfile(TextStream &,Config::CompareMode) override {}
+    void writeXMLDoxyfile(TextStream &) override {}
+    void writeXSDDoxyfile(TextStream &) override;
+    void substEnvVars() override {}
 };
 
 // some convenience macros for access the config options

src/definitionimpl.h

@@ -157,7 +157,7 @@ class DefinitionMixin : public Base
     DefinitionMixin &operator=(const DefinitionMixin &) = default;
     DefinitionMixin(DefinitionMixin &&) = delete;
     DefinitionMixin &operator=(DefinitionMixin &&) = delete;
-   ~DefinitionMixin() = default;
+   ~DefinitionMixin() override = default;
 
     bool isAlias() const override { return FALSE; }
 
@@ -326,7 +326,7 @@ class DefinitionAliasMixin : public Base
   public:
     DefinitionAliasMixin(const Definition *scope,const Definition *alias)
       : m_impl(this,scope,alias), m_scope(scope), m_alias(alias) {}
-    virtual ~DefinitionAliasMixin() = default;
+   ~DefinitionAliasMixin() override = default;
     NON_COPYABLE(DefinitionAliasMixin)
 
     void init() { m_impl.init(); }

src/dirdef.h

@@ -112,12 +112,6 @@ class DirDef : public DefinitionMutable, public Definition
     class UsedDirLinkedMap : public LinkedMap<UsedDir> {};
 
     // accessors
-    virtual DefType definitionType() const = 0;
-    virtual QCString getOutputFileBase() const = 0;
-    virtual QCString anchor() const = 0;
-    virtual bool isLinkableInProject() const = 0;
-    virtual bool isLinkable() const = 0;
-    virtual QCString displayName(bool=TRUE) const = 0;
     virtual const QCString shortName() const = 0;
     virtual void addSubDir(DirDef *subdir) = 0;
     virtual const FileList &getFiles() const = 0;

src/dotcallgraph.h

@@ -27,7 +27,7 @@ class DotCallGraph : public DotGraph
 {
   public:
     DotCallGraph(const MemberDef *md,bool inverse);
-    ~DotCallGraph();
+    ~DotCallGraph() override;
     NON_COPYABLE(DotCallGraph)
 
     bool isTrivial() const;
@@ -40,9 +40,9 @@ class DotCallGraph : public DotGraph
     static bool isTrivial(const MemberDef *md,bool inverse);
 
   protected:
-    virtual QCString getBaseName() const;
-    virtual QCString getMapLabel() const;
-    virtual void computeTheGraph();
+    QCString getBaseName() const override;
+    QCString getMapLabel() const override;
+    void computeTheGraph() override;
 
   private:
     void buildGraph(DotNode *n,const MemberDef *md,int distance);