Qml: add missing 'override'

... and drop redundant 'virtual'

Change-Id: I8c0d589557f590eb528e80414d9c002504ccb12a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 277 insertions, 277 deletions

diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index 2ca4e883d6..846ea42571 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -273,12 +273,12 @@ public:
         : expression(expression)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lparenToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rparenToken; }
 
 // attributes
@@ -294,12 +294,12 @@ public:
 
     ThisExpression() { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return thisToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return thisToken; }
 
 // attributes
@@ -314,12 +314,12 @@ public:
     IdentifierExpression(const QStringRef &n):
         name (n) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return identifierToken; }
 
 // attributes
@@ -334,12 +334,12 @@ public:
 
     NullExpression() { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return nullToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return nullToken; }
 
 // attributes
@@ -353,12 +353,12 @@ public:
 
     TrueLiteral() { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return trueToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return trueToken; }
 
 // attributes
@@ -372,12 +372,12 @@ public:
 
     FalseLiteral() { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return falseToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return falseToken; }
 
 // attributes
@@ -392,12 +392,12 @@ public:
     NumericLiteral(double v):
         value(v) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return literalToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return literalToken; }
 
 // attributes:
@@ -413,12 +413,12 @@ public:
     StringLiteral(const QStringRef &v):
         value (v) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return literalToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return literalToken; }
 
 // attributes:
@@ -434,12 +434,12 @@ public:
     RegExpLiteral(const QStringRef &p, int f):
         pattern (p), flags (f) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return literalToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return literalToken; }
 
 // attributes:
@@ -465,12 +465,12 @@ public:
         elements (elts), elision (e)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lbracketToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbracketToken; }
 
 // attributes
@@ -492,12 +492,12 @@ public:
     ObjectLiteral(PropertyAssignmentList *plist):
         properties (plist) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lbraceToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
 // attributes
@@ -521,12 +521,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return commaToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : commaToken; }
 
     inline Elision *finish ()
@@ -565,16 +565,16 @@ public:
         return front;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     {
         if (elision)
             return elision->firstSourceLocation();
         return expression->firstSourceLocation();
     }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (next)
             return next->lastSourceLocation();
@@ -595,10 +595,10 @@ public:
 
     PropertyName() { kind = K; }
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return propertyNameToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return propertyNameToken; }
 
     virtual QString asString() const = 0;
@@ -642,12 +642,12 @@ public:
         return front;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return assignment->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : assignment->lastSourceLocation(); }
 
 // attributes
@@ -665,12 +665,12 @@ public:
         : PropertyAssignment(n), value(v)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return name->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return value->lastSourceLocation(); }
 
 // attributes
@@ -697,12 +697,12 @@ public:
         : PropertyAssignment(n), type(Setter), formals(f), functionBody (b)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return getSetToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
 // attributes
@@ -724,9 +724,9 @@ public:
     IdentifierPropertyName(const QStringRef &n):
         id (n) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual QString asString() const { return id.toString(); }
+    QString asString() const override { return id.toString(); }
 
 // attributes
     QStringRef id;
@@ -740,9 +740,9 @@ public:
     StringLiteralPropertyName(const QStringRef &n):
         id (n) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual QString asString() const { return id.toString(); }
+    QString asString() const override { return id.toString(); }
 
 // attributes
     QStringRef id;
@@ -756,9 +756,9 @@ public:
     NumericLiteralPropertyName(double n):
         id (n) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual QString asString() const { return QString::number(id, 'g', 16); }
+    QString asString() const override { return QString::number(id, 'g', 16); }
 
 // attributes
     double id;
@@ -773,12 +773,12 @@ public:
         base (b), expression (e)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return base->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbracketToken; }
 
 // attributes
@@ -797,12 +797,12 @@ public:
         base (b), name (n)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return base->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return identifierToken; }
 
     // attributes
@@ -821,12 +821,12 @@ public:
         base (b), arguments (a)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return newToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rparenToken; }
 
     // attributes
@@ -845,12 +845,12 @@ public:
     NewExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return newToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -867,12 +867,12 @@ public:
         base (b), arguments (a)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return base->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rparenToken; }
 
 // attributes
@@ -899,12 +899,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return expression->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (next)
             return next->lastSourceLocation();
@@ -932,12 +932,12 @@ public:
     PostIncrementExpression(ExpressionNode *b):
         base (b) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return base->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return incrementToken; }
 
 // attributes
@@ -953,12 +953,12 @@ public:
     PostDecrementExpression(ExpressionNode *b):
         base (b) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return base->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return decrementToken; }
 
 // attributes
@@ -974,12 +974,12 @@ public:
     DeleteExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return deleteToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -995,12 +995,12 @@ public:
     VoidExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return voidToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1016,12 +1016,12 @@ public:
     TypeOfExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return typeofToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1037,12 +1037,12 @@ public:
     PreIncrementExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return incrementToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1058,12 +1058,12 @@ public:
     PreDecrementExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return decrementToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1079,12 +1079,12 @@ public:
     UnaryPlusExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return plusToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1100,12 +1100,12 @@ public:
     UnaryMinusExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return minusToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1121,12 +1121,12 @@ public:
     TildeExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return tildeToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1142,12 +1142,12 @@ public:
     NotExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return notToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression->lastSourceLocation(); }
 
 // attributes
@@ -1164,14 +1164,14 @@ public:
         left (l), op (o), right (r)
         { kind = K; }
 
-    virtual BinaryExpression *binaryExpressionCast();
+    BinaryExpression *binaryExpressionCast() override;
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return left->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return right->lastSourceLocation(); }
 
 // attributes
@@ -1190,12 +1190,12 @@ public:
         expression (e), ok (t), ko (f)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return expression->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return ko->lastSourceLocation(); }
 
 // attributes
@@ -1214,12 +1214,12 @@ public:
     Expression(ExpressionNode *l, ExpressionNode *r):
         left (l), right (r) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return left->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return right->lastSourceLocation(); }
 
 // attributes
@@ -1236,12 +1236,12 @@ public:
     Block(StatementList *slist):
         statements (slist) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lbraceToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
     // attributes
@@ -1267,12 +1267,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return statement->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : statement->lastSourceLocation(); }
 
     inline StatementList *finish ()
@@ -1296,12 +1296,12 @@ public:
         declarations (vlist)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return declarationKindToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1319,12 +1319,12 @@ public:
         name (n), expression (e), readOnly(false)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return expression ? expression->lastSourceLocation() : identifierToken; }
 
 // attributes
@@ -1351,12 +1351,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return declaration->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (next)
             return next->lastSourceLocation();
@@ -1388,12 +1388,12 @@ public:
 
     EmptyStatement() { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return semicolonToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1408,12 +1408,12 @@ public:
     ExpressionStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return expression->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1430,12 +1430,12 @@ public:
         expression (e), ok (t), ko (f)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return ifToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (ko)
             return ko->lastSourceLocation();
@@ -1462,12 +1462,12 @@ public:
         statement (stmt), expression (e)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return doToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1489,12 +1489,12 @@ public:
         expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return whileToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1514,12 +1514,12 @@ public:
         initialiser (i), condition (c), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return forToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1543,12 +1543,12 @@ public:
         declarations (vlist), condition (c), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return forToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1573,12 +1573,12 @@ public:
         initialiser (i), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return forToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1600,12 +1600,12 @@ public:
         declaration (v), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return forToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1627,12 +1627,12 @@ public:
     ContinueStatement(const QStringRef &l = QStringRef()):
         label (l) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return continueToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1650,12 +1650,12 @@ public:
     BreakStatement(const QStringRef &l):
         label (l) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return breakToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
     // attributes
@@ -1673,12 +1673,12 @@ public:
     ReturnStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return returnToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -1696,12 +1696,12 @@ public:
         expression (e), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return withToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1721,12 +1721,12 @@ public:
         clauses (c), defaultClause (d), moreClauses (r)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lbraceToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
 // attributes
@@ -1746,12 +1746,12 @@ public:
         expression (e), block (b)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return switchToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return block->rbraceToken; }
 
 // attributes
@@ -1771,12 +1771,12 @@ public:
         expression (e), statements (slist)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return caseToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statements ? statements->lastSourceLocation() : colonToken; }
 
 // attributes
@@ -1803,12 +1803,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return clause->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : clause->lastSourceLocation(); }
 
     inline CaseClauses *finish ()
@@ -1832,12 +1832,12 @@ public:
         statements (slist)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return defaultToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statements ? statements->lastSourceLocation() : colonToken; }
 
 // attributes
@@ -1855,12 +1855,12 @@ public:
         label (l), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1878,12 +1878,12 @@ public:
     ThrowStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return throwToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
     // attributes
@@ -1901,12 +1901,12 @@ public:
         name (n), statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return catchToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -1927,12 +1927,12 @@ public:
         statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return finallyToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement ? statement->lastSourceLocation() : finallyToken; }
 
 // attributes
@@ -1957,12 +1957,12 @@ public:
         statement (stmt), catchExpression (c), finallyExpression (0)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return tryToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (finallyExpression)
             return finallyExpression->statement->rbraceToken;
@@ -1988,12 +1988,12 @@ public:
         name (n), formals (f), body (b)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return functionToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
 // attributes
@@ -2017,7 +2017,7 @@ public:
         FunctionExpression(n, f, b)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 };
 
 class QML_PARSER_EXPORT FormalParameterList: public Node
@@ -2037,12 +2037,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : identifierToken; }
 
     inline FormalParameterList *finish ()
@@ -2085,12 +2085,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return element->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : element->lastSourceLocation(); }
 
     inline SourceElements *finish ()
@@ -2114,12 +2114,12 @@ public:
         elements (elts)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return elements ? elements->firstSourceLocation() : SourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return elements ? elements->lastSourceLocation() : SourceLocation(); }
 
 // attributes
@@ -2135,12 +2135,12 @@ public:
         elements (elts)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return elements ? elements->firstSourceLocation() : SourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return elements ? elements->lastSourceLocation() : SourceLocation(); }
 
 // attributes
@@ -2156,12 +2156,12 @@ public:
         declaration (f)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return declaration->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return declaration->lastSourceLocation(); }
 
 // attributes
@@ -2177,12 +2177,12 @@ public:
         statement (stmt)
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return statement->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
 // attributes
@@ -2197,12 +2197,12 @@ public:
     DebuggerStatement()
         { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return debuggerToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -2234,12 +2234,12 @@ public:
         return head;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : identifierToken; }
 
 // attributes
@@ -2261,12 +2261,12 @@ public:
         : importUri(uri)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return importToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -2284,10 +2284,10 @@ public:
 class QML_PARSER_EXPORT UiObjectMember: public Node
 {
 public:
-    virtual SourceLocation firstSourceLocation() const = 0;
-    virtual SourceLocation lastSourceLocation() const = 0;
+    SourceLocation firstSourceLocation() const override = 0;
+    SourceLocation lastSourceLocation() const override = 0;
 
-    virtual UiObjectMember *uiObjectMemberCast();
+    UiObjectMember *uiObjectMemberCast() override;
 };
 
 class QML_PARSER_EXPORT UiObjectMemberList: public Node
@@ -2307,12 +2307,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return member->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : member->lastSourceLocation(); }
 
     UiObjectMemberList *finish()
@@ -2351,12 +2351,12 @@ public:
         return head;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : identifierToken; }
 
 // attributes
@@ -2374,12 +2374,12 @@ public:
         : pragmaType(type)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return pragmaToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return semicolonToken; }
 
 // attributes
@@ -2424,12 +2424,12 @@ public:
         return head;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return headerItem->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : headerItem->lastSourceLocation(); }
 
 // attributes
@@ -2446,9 +2446,9 @@ public:
         : headers(headers), members(members)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     {
         if (headers)
             return headers->firstSourceLocation();
@@ -2457,7 +2457,7 @@ public:
         return SourceLocation();
     }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
         if (members)
             return members->lastSourceLocation();
@@ -2488,12 +2488,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return member->firstSourceLocation(); }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : member->lastSourceLocation(); }
 
     UiArrayMemberList *finish()
@@ -2518,12 +2518,12 @@ public:
         : members(members)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return lbraceToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbraceToken; }
 
 // attributes
@@ -2549,12 +2549,12 @@ public:
         previous->next = this;
     }
 
-    virtual void accept0(Visitor *);
+    void accept0(Visitor *) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return propertyTypeToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return next ? next->lastSourceLocation() : identifierToken; }
 
     inline UiParameterList *finish ()
@@ -2589,9 +2589,9 @@ public:
         : type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     {
       if (defaultToken.isValid())
         return defaultToken;
@@ -2601,7 +2601,7 @@ public:
       return propertyToken;
     }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
       if (binding)
           return binding->lastSourceLocation();
@@ -2641,12 +2641,12 @@ public:
         : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
     { kind = K; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return qualifiedTypeNameId->identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return initializer->rbraceToken; }
 
 // attributes
@@ -2663,7 +2663,7 @@ public:
         : sourceElement(sourceElement)
     { kind = K; }
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     {
       if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
         return funDecl->firstSourceLocation();
@@ -2673,7 +2673,7 @@ public:
       return SourceLocation();
     }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     {
       if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
         return funDecl->lastSourceLocation();
@@ -2683,7 +2683,7 @@ public:
       return SourceLocation();
     }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
 
 // attributes
@@ -2704,7 +2704,7 @@ public:
           hasOnToken(false)
     { kind = K; }
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     {
         if (hasOnToken && qualifiedTypeNameId)
             return qualifiedTypeNameId->identifierToken;
@@ -2712,10 +2712,10 @@ public:
         return qualifiedId->identifierToken;
     }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return initializer->rbraceToken; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
 
 // attributes
@@ -2737,13 +2737,13 @@ public:
           statement(statement)
     { kind = K; }
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return qualifiedId->identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return statement->lastSourceLocation(); }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
 // attributes
     UiQualifiedId *qualifiedId;
@@ -2762,13 +2762,13 @@ public:
           members(members)
     { kind = K; }
 
-    virtual SourceLocation firstSourceLocation() const
+    SourceLocation firstSourceLocation() const override
     { return qualifiedId->identifierToken; }
 
-    virtual SourceLocation lastSourceLocation() const
+    SourceLocation lastSourceLocation() const override
     { return rbracketToken; }
 
-    virtual void accept0(Visitor *visitor);
+    void accept0(Visitor *visitor) override;
 
 // attributes
     UiQualifiedId *qualifiedId;