Introduce override

Change-Id: I5d4f586301ce38a92bc9c3b365af0916df7d0663
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

7 files changed, 66 insertions, 66 deletions

diff --git a/ApiExtractor/doxygenparser.h b/ApiExtractor/doxygenparser.h
index 7314cfe..3f9ca51 100644
--- a/ApiExtractor/doxygenparser.h
+++ b/ApiExtractor/doxygenparser.h
@@ -35,9 +35,9 @@ class DoxygenParser : public DocParser
 {
 public:
     DoxygenParser()  {}
-    virtual void fillDocumentation(AbstractMetaClass *metaClass);
-    virtual Documentation retrieveModuleDocumentation();
-    virtual Documentation retrieveModuleDocumentation(const QString& name);
+    void fillDocumentation(AbstractMetaClass *metaClass) override;
+    Documentation retrieveModuleDocumentation() override;
+    Documentation retrieveModuleDocumentation(const QString& name) override;
 };
 
 #endif // DOXYGENPARSER_H
diff --git a/ApiExtractor/parser/codemodel.h b/ApiExtractor/parser/codemodel.h
index 811cfec..0d7fe57 100644
--- a/ApiExtractor/parser/codemodel.h
+++ b/ApiExtractor/parser/codemodel.h
@@ -320,7 +320,7 @@ public:
     FunctionModelItem declaredFunction(FunctionModelItem item);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 protected:
@@ -372,7 +372,7 @@ public:
     QStringList propertyDeclarations() const { return m_propertyDeclarations; }
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -402,7 +402,7 @@ public:
     NamespaceModelItem findNamespace(const QString &name) const;
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -442,7 +442,7 @@ public:
     void setDefaultValueExpression(const QString &expr) { m_defaultValueExpression = expr; }
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -496,7 +496,7 @@ public:
     void setType(const TypeInfo &type);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -558,7 +558,7 @@ public:
     bool isSimilar(FunctionModelItem other) const;
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -602,7 +602,7 @@ public:
     void setType(const TypeInfo &type);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -629,7 +629,7 @@ public:
     void setAnonymous(bool anonymous);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -653,7 +653,7 @@ public:
     void setValue(const QString &value);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
@@ -678,7 +678,7 @@ public:
     void setDefaultValue(bool defaultValue);
 
 #ifndef QT_NO_DEBUG_STREAM
-    void formatDebug(QDebug &d) const Q_DECL_OVERRIDE;
+    void formatDebug(QDebug &d) const override;
 #endif
 
 private:
diff --git a/ApiExtractor/qtdocparser.h b/ApiExtractor/qtdocparser.h
index 04c4918..f6bd479 100644
--- a/ApiExtractor/qtdocparser.h
+++ b/ApiExtractor/qtdocparser.h
@@ -35,9 +35,9 @@ class QtDocParser : public DocParser
 {
 public:
     QtDocParser() {}
-    virtual void fillDocumentation(AbstractMetaClass* metaClass);
-    virtual Documentation retrieveModuleDocumentation();
-    virtual Documentation retrieveModuleDocumentation(const QString& name);
+    void fillDocumentation(AbstractMetaClass* metaClass) override;
+    Documentation retrieveModuleDocumentation() override;
+    Documentation retrieveModuleDocumentation(const QString& name) override;
 };
 
 #endif // QTDOCPARSER_H
diff --git a/ApiExtractor/typesystem.h b/ApiExtractor/typesystem.h
index a8ee0ce..80b3f1c 100644
--- a/ApiExtractor/typesystem.h
+++ b/ApiExtractor/typesystem.h
@@ -1004,11 +1004,11 @@ public:
         return m_nestedType;
     }
 
-    QString targetLangName() const
+    QString targetLangName() const override
     {
         return m_nestedType->targetLangName() + QLatin1String("[]");
     }
-    QString targetLangApiName() const
+    QString targetLangApiName() const override
     {
         if (m_nestedType->isPrimitive())
             return m_nestedType->targetLangApiName() + QLatin1String("Array");
@@ -1032,7 +1032,7 @@ public:
     {
     }
 
-    QString targetLangName() const
+    QString targetLangName() const override
     {
         return m_targetLangName;
     }
@@ -1041,7 +1041,7 @@ public:
         m_targetLangName  = targetLangName;
     }
 
-    QString targetLangApiName() const
+    QString targetLangApiName() const override
     {
         return m_targetLangApiName;
     }
@@ -1088,26 +1088,26 @@ public:
      */
     PrimitiveTypeEntry* basicReferencedTypeEntry() const;
 
-    virtual bool preferredConversion() const
+    bool preferredConversion() const override
     {
         return m_preferredConversion;
     }
-    virtual void setPreferredConversion(bool b)
+    void setPreferredConversion(bool b) override
     {
         m_preferredConversion = b;
     }
 
-    virtual bool preferredTargetLangType() const
+    bool preferredTargetLangType() const
     {
         return m_preferredTargetLangType;
     }
-    virtual void setPreferredTargetLangType(bool b)
+    void setPreferredTargetLangType(bool b)
     {
         m_preferredTargetLangType = b;
     }
 
     void setTargetLangPackage(const QString& package);
-    QString targetLangPackage() const;
+    QString targetLangPackage() const override;
 private:
     QString m_targetLangName;
     QString m_targetLangApiName;
@@ -1157,7 +1157,7 @@ public:
         return m_targetLangName;
     }
     QString targetLangQualifier() const;
-    QString qualifiedTargetLangName() const
+    QString qualifiedTargetLangName() const override
     {
         QString qualifiedName;
         QString pkg = targetLangPackage();
@@ -1172,7 +1172,7 @@ public:
         return qualifiedName;
     }
 
-    QString targetLangApiName() const;
+    QString targetLangApiName() const override;
 
     QString qualifier() const
     {
@@ -1183,7 +1183,7 @@ public:
         m_qualifier = q;
     }
 
-    virtual bool preferredConversion() const
+    bool preferredConversion() const override
     {
         return false;
     }
@@ -1303,13 +1303,13 @@ public:
     {
     }
 
-    QString qualifiedTargetLangName() const;
-    QString targetLangName() const
+    QString qualifiedTargetLangName() const override;
+    QString targetLangName() const override
     {
         return m_targetLangName;
     }
-    QString targetLangApiName() const;
-    virtual bool preferredConversion() const
+    QString targetLangApiName() const override;
+    bool preferredConversion() const override
     {
         return false;
     }
@@ -1346,7 +1346,7 @@ public:
         m_enum = e;
     }
 
-    QString targetLangPackage() const
+    QString targetLangPackage() const override
     {
         return m_enum->targetLangPackage();
     }
@@ -1414,12 +1414,12 @@ public:
         m_lookupName = name;
     }
 
-    virtual QString lookupName() const
+    QString lookupName() const override
     {
         return m_lookupName.isEmpty() ? targetLangName() : m_lookupName;
     }
 
-    QString targetLangApiName() const;
+    QString targetLangApiName() const override;
 
     void setTypeFlags(TypeFlags flags)
     {
@@ -1495,7 +1495,7 @@ public:
         m_defaultSuperclass = sc;
     }
 
-    virtual QString qualifiedCppName() const
+    QString qualifiedCppName() const override
     {
         return m_qualifiedCppName;
     }
@@ -1547,7 +1547,7 @@ public:
         m_targetType = code;
     }
 
-    QString targetLangName() const
+    QString targetLangName() const override
     {
         return m_targetLangName.isEmpty()
                ? TypeEntry::targetLangName()
@@ -1728,12 +1728,12 @@ class ValueTypeEntry : public ComplexTypeEntry
 public:
     ValueTypeEntry(const QString &name, double vr) : ComplexTypeEntry(name, BasicValueType, vr) { }
 
-    bool isValue() const
+    bool isValue() const override
     {
         return true;
     }
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return true;
     }
@@ -1752,11 +1752,11 @@ public:
         setCodeGeneration(GenerateNothing);
     }
 
-    QString targetLangApiName() const;
-    QString targetLangName() const;
-    QString targetLangPackage() const;
+    QString targetLangApiName() const override;
+    QString targetLangName() const override;
+    QString targetLangPackage() const override;
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return false;
     }
@@ -1770,14 +1770,14 @@ public:
         setCodeGeneration(GenerateNothing);
     }
 
-    QString targetLangApiName() const;
-    QString targetLangName() const;
-    QString targetLangPackage() const
+    QString targetLangApiName() const override;
+    QString targetLangName() const override;
+    QString targetLangPackage() const override
     {
         return QString();
     }
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return false;
     }
@@ -1788,11 +1788,11 @@ class VariantTypeEntry: public ValueTypeEntry
 public:
     VariantTypeEntry(const QString &name, double vr) : ValueTypeEntry(name, VariantType, vr) { }
 
-    QString targetLangApiName() const;
-    QString targetLangName() const;
-    QString targetLangPackage() const;
+    QString targetLangApiName() const override;
+    QString targetLangName() const override;
+    QString targetLangPackage() const override;
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return false;
     }
@@ -1819,11 +1819,11 @@ public:
         m_origin = origin;
     }
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return true;
     }
-    virtual QString qualifiedCppName() const
+    QString qualifiedCppName() const override
     {
         const int len = ComplexTypeEntry::qualifiedCppName().length() - interfaceName(QString()).length();
         return ComplexTypeEntry::qualifiedCppName().left(len);
@@ -1875,7 +1875,7 @@ public:
         m_interface = entry;
     }
 
-    virtual bool isNativeIdBased() const
+    bool isNativeIdBased() const override
     {
         return true;
     }
diff --git a/generator/shiboken2/cppgenerator.h b/generator/shiboken2/cppgenerator.h
index 5dc3f5a..c46d5f8 100644
--- a/generator/shiboken2/cppgenerator.h
+++ b/generator/shiboken2/cppgenerator.h
@@ -39,12 +39,12 @@ class CppGenerator : public ShibokenGenerator
 public:
     CppGenerator();
 protected:
-    QString fileNamePrefix() const;
-    QString fileNameForContext(GeneratorContext &context) const;
+    QString fileNamePrefix() const override;
+    QString fileNameForContext(GeneratorContext &context) const override;
     QList<AbstractMetaFunctionList> filterGroupedOperatorFunctions(const AbstractMetaClass* metaClass,
                                                                    uint query);
-    void generateClass(QTextStream& s, GeneratorContext &classContext);
-    bool finishGeneration();
+    void generateClass(QTextStream& s, GeneratorContext &classContext) override;
+    bool finishGeneration() override;
 
 private:
     void writeConstructorNative(QTextStream& s, const AbstractMetaFunction* func);
diff --git a/generator/shiboken2/headergenerator.h b/generator/shiboken2/headergenerator.h
index 72dcbf6..5c1ffec 100644
--- a/generator/shiboken2/headergenerator.h
+++ b/generator/shiboken2/headergenerator.h
@@ -41,12 +41,12 @@ class AbstractMetaFunction;
 class HeaderGenerator : public ShibokenGenerator
 {
 public:
-    QMap<QString, QString> options() const { return QMap<QString, QString>(); }
+    QMap<QString, QString> options() const override { return QMap<QString, QString>(); }
 protected:
-    QString fileNamePrefix() const;
-    QString fileNameForContext(GeneratorContext &context) const;
-    void generateClass(QTextStream& s, GeneratorContext &classContext);
-    bool finishGeneration();
+    QString fileNamePrefix() const override;
+    QString fileNameForContext(GeneratorContext &context) const override;
+    void generateClass(QTextStream& s, GeneratorContext &classContext) override;
+    bool finishGeneration() override;
 
 private:
     void writeCopyCtor(QTextStream &s, const AbstractMetaClass* metaClass) const;
diff --git a/generator/shiboken2/shibokengenerator.h b/generator/shiboken2/shibokengenerator.h
index 327ca12..915eb02 100644
--- a/generator/shiboken2/shibokengenerator.h
+++ b/generator/shiboken2/shibokengenerator.h
@@ -117,7 +117,7 @@ public:
 
     void writeArgumentNames(QTextStream &s,
                             const AbstractMetaFunction* func,
-                            Options options = NoOption) const;
+                            Options options = NoOption) const override;
 
     /**
      *   Function used to write the fucntion arguments on the class buffer.
@@ -128,7 +128,7 @@ public:
      */
     void writeFunctionArguments(QTextStream &s,
                                 const AbstractMetaFunction* func,
-                                Options options = NoOption) const;
+                                Options options = NoOption) const override;
     QString functionReturnType(const AbstractMetaFunction* func, Options options = NoOption) const;
 
     /// Utility function for writeCodeSnips.
@@ -412,7 +412,7 @@ public:
     QString extendedIsConvertibleFunctionName(const TypeEntry* targetType) const;
     QString extendedToCppFunctionName(const TypeEntry* targetType) const;
 
-    QMap< QString, QString > options() const;
+    QMap< QString, QString > options() const override;
 
     /// Returns true if the user enabled the so called "parent constructor heuristic".
     bool useCtorHeuristic() const;