expr: Add missing override and remove redundant virtual

Change-Id: If9f4b61a6eb739966b3941b1f97ba5dd6252053b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

74 files changed, 474 insertions, 474 deletions

diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index 6dd03041..27f45b68 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -73,17 +73,17 @@ namespace QPatternist
         AndExpression(const Expression::Ptr &operand1,
                       const Expression::Ptr &operand2);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
         /**
          * @returns always CommonSequenceTypes::ExactlyOneBoolean
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 63d81c44..8f7cb00e 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -90,11 +90,11 @@ namespace QPatternist
                       const WithParam::Hash &withParams,
                       const TemplateMode::Ptr &defaultMode);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
 
         /**
          * The only reason this function exists, is in order to convert
@@ -108,11 +108,11 @@ namespace QPatternist
 
         inline TemplateMode::Ptr mode() const;
 
-        virtual bool configureRecursion(const CallTargetDescription::Ptr &sign);
-        virtual Expression::Ptr body() const;
-        virtual CallTargetDescription::Ptr callTargetDescription() const;
+        bool configureRecursion(const CallTargetDescription::Ptr &sign) override;
+        Expression::Ptr body() const override;
+        CallTargetDescription::Ptr callTargetDescription() const override;
 
-        Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
     private:
         typedef QExplicitlySharedDataPointer<const ApplyTemplate> ConstPtr;
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index 3705f733..f2ffafb6 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -71,12 +71,12 @@ namespace QPatternist
         ArgumentReference(const SequenceType::Ptr &sourceType,
                           const VariableSlotID slot);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
 
     private:
         const SequenceType::Ptr m_type;
diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp
index f21dbcba..a8100417 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression.cpp
+++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp
@@ -98,7 +98,7 @@ public:
     {
     }
 
-    virtual const SourceLocationReflection *actualReflection() const
+    const SourceLocationReflection *actualReflection() const override
     {
         return m_reflection;
     }
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index e09635bd..f2201f77 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -78,14 +78,14 @@ namespace QPatternist
                              const AtomicMathematician::Operator op,
                              const Expression::Ptr &operand2);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
         AtomicMathematician::Operator operatorID() const;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         static Item flexiblyCalculate(const Item &op1,
                                       const AtomicMathematician::Operator op,
@@ -105,7 +105,7 @@ namespace QPatternist
                            const SourceLocationReflection *const reflection,
                            const ReportContext::ErrorCode code = ReportContext::XPTY0004,
                            const bool isCompat = false);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
     protected:
 
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 317d2bee..598f5e1a 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -71,25 +71,25 @@ namespace QPatternist
         AttributeConstructor(const Expression::Ptr &operand1,
                              const Expression::Ptr &operand2);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * The first operand must be exactly one @c xs:QName, and the second
          * argument can be zero or more items.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * @returns always IDAttributeConstructor.
          */
-        virtual ID id() const;
+        ID id() const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
     private:
         static inline QString processValue(const QXmlName name,
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index c61d43b2..8a66b2a1 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -73,18 +73,18 @@ namespace QPatternist
     public:
         AttributeNameValidator(const Expression::Ptr &source);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns the static type of its operand. This is returned as opposed
          * CommonSequenceTypes::ExactlyOneQName, since the operand might return a subtype
          * of @c xs:QName.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index 30aa630d..68d62e29 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -70,8 +70,8 @@ namespace QPatternist
         AxisStep(const QXmlNodeModelIndex::Axis axis,
                  const ItemType::Ptr &nodeTest);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
         /**
          * Returns @p node if it matches the node test this step is using, otherwise @c null.
@@ -79,23 +79,23 @@ namespace QPatternist
         inline Item mapToItem(const QXmlNodeModelIndex &node,
                               const DynamicContext::Ptr &context) const;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Rewrites to ParentNodeAxis, if possible.
          */
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * @returns always BuiltinTypes::node;
          */
-        virtual ItemType::Ptr expectedContextItemType() const;
+        ItemType::Ptr expectedContextItemType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
         /**
          * @returns the axis this step is using.
@@ -124,8 +124,8 @@ namespace QPatternist
          */
         static QString axisName(const QXmlNodeModelIndex::Axis axis);
 
-        virtual ID id() const;
-        virtual PatternPriority patternPriority() const;
+        ID id() const override;
+        PatternPriority patternPriority() const override;
 
         inline void setAxis(const QXmlNodeModelIndex::Axis newAxis);
 
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index 136b8da4..17ec7c5b 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -73,14 +73,14 @@ namespace QPatternist
         CallTemplate(const QXmlName &name,
                      const WithParam::Hash &withParams);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
-        virtual Properties dependencies() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
+        Properties dependencies() const override;
 
         /**
          * This is a bit complicated by that we have two required types, one
@@ -91,8 +91,8 @@ namespace QPatternist
          * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL
          * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a>
          */
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
 
         inline void setTemplate(const Template::Ptr &templ)
@@ -100,9 +100,9 @@ namespace QPatternist
             m_template = templ;
         }
 
-        virtual bool configureRecursion(const CallTargetDescription::Ptr &sign);
-        virtual Expression::Ptr body() const;
-        virtual CallTargetDescription::Ptr callTargetDescription() const;
+        bool configureRecursion(const CallTargetDescription::Ptr &sign) override;
+        Expression::Ptr body() const override;
+        CallTargetDescription::Ptr callTargetDescription() const override;
     private:
         Template::Ptr   m_template;
     };
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index eff56183..3412be20 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
         CastableAs(const Expression::Ptr &operand,
                              const SequenceType::Ptr &targetType);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
 
         /**
          * Overridden to const fold to @c true when the target type
@@ -81,14 +81,14 @@ namespace QPatternist
          * the type identical to the target type, <tt>xs:string</tt>,
          * and <tt>xs:untypedAtomic</tt>.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline ItemType::Ptr targetType() const
         {
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index 3aeeef25..66fcf43f 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -91,9 +91,9 @@ namespace QPatternist
         CastAs(const Expression::Ptr &source,
                const SequenceType::Ptr &targetType);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns a SequenceType where the ItemType is this CastAs's
@@ -101,21 +101,21 @@ namespace QPatternist
          * source operand to reflect whether this CastAs always will evaluate to
          * exactly-one or zero-or-one values.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Overridden in order to check that casting to an abstract type
          * is not attempted.
          */
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * If the target type is the same as the source type, it is rewritten
          * to the operand.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline ItemType::Ptr targetType() const
         {
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index ed04d438..15431e42 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -72,19 +72,19 @@ namespace QPatternist
     public:
         CollationChecker(const Expression::Ptr &source);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
         /**
          * Expects exactly one string.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns its operand's static type.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index 84991357..a56621b0 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -79,16 +79,16 @@ namespace QPatternist
                      const Operator op,
                      const Expression::Ptr &operand2);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         Operator operatorID() const;
-        virtual ID id() const;
+        ID id() const override;
 
         /**
          * Determines the string representation for operator @p op.
@@ -98,7 +98,7 @@ namespace QPatternist
          */
         static QString displayName(const Operator op);
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
     private:
         const Operator m_operator;
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index 6190a8d7..4e7312d9 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -70,19 +70,19 @@ namespace QPatternist
     public:
         CommentConstructor(const Expression::Ptr &operand);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * The first operand must be exactly one @c xs:string.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
     private:
         inline QString evaluateContent(const DynamicContext::Ptr &context) const;
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index fa19bec4..6d5c1dc4 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -70,12 +70,12 @@ namespace QPatternist
         ComputedNamespaceConstructor(const Expression::Ptr &prefix,
                                      const Expression::Ptr &namespaceURI);
 
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * The static type is exactly one attribute node. It's unclear what
@@ -84,10 +84,10 @@ namespace QPatternist
          * conceptually correct, since a namespace node isn't an attribute
          * node.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Expression::Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Expression::Properties properties() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index 6c48e72e..a59837cf 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -77,39 +77,39 @@ namespace QPatternist
         {
         }
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns always DisableElimination and RequiresContextItem
          */
-        virtual Expression::Properties properties() const;
+        Expression::Properties properties() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * Overridden to store a pointer to StaticContext::contextItemType().
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         /**
          * Overridden to store a pointer to StaticContext::contextItemType().
          */
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * @returns always IDContextItem
          */
-        virtual ID id() const;
+        ID id() const override;
 
         /**
          * @returns always BuiltinTypes::item;
          */
-        virtual ItemType::Ptr expectedContextItemType() const;
+        ItemType::Ptr expectedContextItemType() const override;
 
-        virtual const SourceLocationReflection *actualReflection() const;
-        virtual void announceFocusType(const ItemType::Ptr &type);
+        const SourceLocationReflection *actualReflection() const override;
+        void announceFocusType(const ItemType::Ptr &type) override;
 
     private:
         ItemType::Ptr           m_itemType;
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index d481f672..d8148d2b 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -79,28 +79,28 @@ namespace QPatternist
                const bool inheritNSS,
                const bool preserveNSS);
 
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns always the SequenceType passed in the constructor to this class. That is, the
          * SequenceType that the operand must conform to.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline Item mapToItem(const Item &source,
                               const DynamicContext::Ptr &context) const;
 
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
-        virtual Properties properties() const;
-        virtual ItemType::Ptr expectedContextItemType() const;
+        Properties properties() const override;
+        ItemType::Ptr expectedContextItemType() const override;
 
     private:
         typedef QExplicitlySharedDataPointer<const CopyOf> ConstPtr;
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index 63bfb4e5..7ef9a54d 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -69,23 +69,23 @@ namespace QPatternist
     public:
         CurrentItemStore(const Expression::Ptr &operand);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
         /**
          * @returns the staticType() of its operand.
          */
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual const SourceLocationReflection *actualReflection() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        const SourceLocationReflection *actualReflection() const override;
 
     private:
         static inline StaticContext::Ptr newStaticContext(const StaticContext::Ptr &context);
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index e3df4939..04cad26e 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -72,20 +72,20 @@ namespace QPatternist
     public:
         DocumentConstructor(const Expression::Ptr &operand);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
         /**
          * The first operand must be exactly one @c xs:string.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual Properties properties() const;
-        virtual SequenceType::Ptr staticType() const;
+        Properties properties() const override;
+        SequenceType::Ptr staticType() const override;
 
     private:
         QUrl m_staticBaseURI;
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index d5fd1dde..17575c1d 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -76,27 +76,27 @@ namespace QPatternist
                                  const DynamicContext::Ptr &context,
                                  const Expression::ConstPtr &expr);
 
-        virtual void namespaceBinding(const QXmlName &nb);
-        virtual void characters(const QStringRef &value);
-        virtual void comment(const QString &value);
+        void namespaceBinding(const QXmlName &nb) override;
+        void characters(const QStringRef &value) override;
+        void comment(const QString &value) override;
 
-        virtual void startElement(const QXmlName &name);
+        void startElement(const QXmlName &name) override;
 
-        virtual void endElement();
+        void endElement() override;
 
-        virtual void attribute(const QXmlName &name,
-                               const QStringRef &value);
+        void attribute(const QXmlName &name,
+                       const QStringRef &value) override;
 
-        virtual void processingInstruction(const QXmlName &name,
-                                           const QString &value);
+        void processingInstruction(const QXmlName &name,
+                                   const QString &value) override;
 
-        virtual void item(const Item &item);
+        void item(const Item &item) override;
 
-        virtual void startDocument();
-        virtual void endDocument();
-        virtual void atomicValue(const QVariant &value);
-        virtual void startOfSequence();
-        virtual void endOfSequence();
+        void startDocument() override;
+        void endDocument() override;
+        void atomicValue(const QVariant &value) override;
+        void startOfSequence() override;
+        void endOfSequence() override;
 
     private:
         QAbstractXmlReceiver *const      m_receiver;
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index 66080ca6..3845143f 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -69,17 +69,17 @@ namespace QPatternist
         DynamicContextStore(const Expression::Ptr &operand,
                             const DynamicContext::Ptr &context);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
         /**
          * @returns the staticType() of its operand.
          */
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual const SourceLocationReflection *actualReflection() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        const SourceLocationReflection *actualReflection() const override;
 
     private:
         DynamicContext *m_context;
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index 00492d75..ac63f9de 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -74,21 +74,21 @@ namespace QPatternist
                            const Expression::Ptr &operand2,
                            const bool isXSLT);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * The first operand must be exactly one @c xs:QName, and the second
          * argument can be zero or more items.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        Properties properties() const override;
 
     private:
         QUrl m_staticBaseURI;
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index 5a8c8248..18cc0cbd 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -68,24 +68,24 @@ namespace QPatternist
         /**
          * @returns always an empty list.
          */
-        virtual Expression::List operands() const;
+        Expression::List operands() const override;
 
         /**
          * Does nothing, since sub-classes has no operands. Calling
          * it makes hence no sense, and it also results in an assert crash.
          */
-        virtual void setOperands(const Expression::List &);
+        void setOperands(const Expression::List &) override;
 
     protected:
         /**
          * @returns always @c true
          */
-        virtual bool compressOperands(const StaticContext::Ptr &context);
+        bool compressOperands(const StaticContext::Ptr &context) override;
 
         /**
          * @returns always an empty list since it has no operands.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
     };
 }
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index e487d3f8..8a9a61d6 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -92,22 +92,22 @@ namespace QPatternist
         /**
          * @returns always an empty iterator, an instance of EmptyIterator.
          */
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
 
         /**
          * @returns always @c null.
          */
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
         /**
          * Does nothing.
          */
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &) const override;
 
         /**
          * @returns always @c false.
          */
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns always CommonSequenceTypes::Empty
@@ -117,11 +117,11 @@ namespace QPatternist
         /**
          * @returns always CommonSequenceTypes::Empty
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
-        virtual Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
+        Properties properties() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index d3ac4222..c0e7b45d 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -96,22 +96,22 @@ namespace QPatternist
                         const VariableDeclaration::Ptr &varDecl,
                         const VariableSlotID slot);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * The first operand must be exactly one @c xs:string.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual const SourceLocationReflection *actualReflection() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        const SourceLocationReflection *actualReflection() const override;
 
         inline VariableSlotID slot() const
         {
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index 3e153431..9d74f113 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -759,12 +759,12 @@ namespace QPatternist
         /**
          * @short Returns @c this.
          */
-        virtual const SourceLocationReflection *actualReflection() const;
+        const SourceLocationReflection *actualReflection() const override;
 
         /**
          * Reimplementation of SourceLocationReflection::description().
          */
-        virtual QString description() const;
+        QString description() const override;
 
         /**
          * When this function is called, it signals that the parent will create
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 0818e902..d8602960 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -77,15 +77,15 @@ namespace QPatternist
          */
         ExpressionSequence(const Expression::List &operands);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
 
         /**
          * Forwards the call to its children.
          */
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Removes any empty sequences, typically "()", from its list of children. If
@@ -96,21 +96,21 @@ namespace QPatternist
          * optimizations have rewritten themselves into empty sequences. Thus,
          * saving memory consumption and runtime overhead.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         inline Item::Iterator::Ptr mapToSequence(const Expression::Ptr &,
                                                  const DynamicContext::Ptr &) const;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
         /**
          * @returns Expression::DisableElimination, plus the union
          * of all this ExpressionSequence's children's properties. If any child
          * does not have IsEvaluated, it is removed from the result.
          */
-        virtual Expression::Properties properties() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        Expression::Properties properties() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
     private:
         typedef QExplicitlySharedDataPointer<const ExpressionSequence> ConstPtr;
     };
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index ed4047b9..55cb0426 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -75,15 +75,15 @@ namespace QPatternist
         ExpressionVariableReference(const VariableSlotID slot,
                                     const VariableDeclaration *varDecl);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual SequenceType::Ptr staticType() const;
-        virtual ID id() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        SequenceType::Ptr staticType() const override;
+        ID id() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline const Expression::Ptr &sourceExpression() const;
         inline const VariableDeclaration *variableDeclaration() const;
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index 09c61e81..06a759bf 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -73,18 +73,18 @@ namespace QPatternist
         ExternalVariableReference(const QXmlName &name,
                                   const SequenceType::Ptr &type);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns always DisableElimination
          */
-        virtual Expression::Properties properties() const;
+        Expression::Properties properties() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
     private:
         const QXmlName             m_name;
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index efdca745..04174331 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -76,30 +76,30 @@ namespace QPatternist
         /**
          * @returns the first item, if any, from evaluating the source expression.
          */
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
         /**
          * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems instance.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns a SequenceType where the item type is the same as the source expression
          * and where the cardinality is either Cardinality::zeroOrOne() or Cardinality::exactlyOne(),
          * depending on the source expression.
          */
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * Rewrites <tt>expression[1][1]</tt> into <tt>expression[1]</tt>.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         /**
          * @returns always IDFirstItemPredicate.
          */
-        virtual ID id() const;
+        ID id() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index 31ea033f..a7369f93 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -76,27 +76,27 @@ namespace QPatternist
                   const Expression::Ptr &returnExpression,
                   const VariableSlotID positionSlot);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override;
 
         inline Item mapToItem(const Item &item,
                               const DynamicContext::Ptr &context) const;
-        virtual ID id() const;
+        ID id() const override;
         inline Item::Iterator::Ptr mapToSequence(const Item &item,
                                                  const DynamicContext::Ptr &context) const;
 
         /**
          * Sets m_allowsMany properly.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
     private:
         inline void riggPositionalVariable(const DynamicContext::Ptr &context,
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index b3fffca8..fcd86420 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -82,21 +82,21 @@ namespace QPatternist
                           const bool isBackwardsCompat = false);
         ~GeneralComparison();
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * @returns always IDGeneralComparison
          */
-        virtual ID id() const;
+        ID id() const override;
 
-        virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const;
+        QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override;
 
         /**
          * @returns the operator that this GeneralComparison is using.
@@ -109,7 +109,7 @@ namespace QPatternist
         /**
          * Overridden to optimize case-insensitive compares.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
     private:
         static inline void updateType(ItemType::Ptr &type,
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index 37ffeb3b..a5a78252 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -92,28 +92,28 @@ namespace QPatternist
          * its QAbstractXmlForwardIterator::next() calls, and since the Focus references the same QAbstractXmlForwardIterator,
          * the focus is automatically moved.
          */
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
 
         /**
          * Doesn't return the first item from calling evaluateSequence(), but does the mapping
          * manually. This avoid allocating an ItemMappingIterator.
          */
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
         inline Item mapToItem(const Item &subject,
                                    const DynamicContext::Ptr &) const;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
 
         /**
          * @returns always CreatesFocusForLast.
          */
-        virtual Properties properties() const;
+        Properties properties() const override;
 
-        virtual QString description() const;
+        QString description() const override;
 
     protected:
 
@@ -130,7 +130,7 @@ namespace QPatternist
         /**
          * @returns the ItemType of the first operand's staticType().
          */
-        virtual ItemType::Ptr newFocusType() const;
+        ItemType::Ptr newFocusType() const override;
 
     private:
         typedef QExplicitlySharedDataPointer<const GenericPredicate> ConstPtr;
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index d26ccb06..8cb1d78f 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -71,22 +71,22 @@ namespace QPatternist
                      const Expression::Ptr &then,
                      const Expression::Ptr &el);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
         /**
          * @returns IDIfThenClause
          */
-        virtual ID id() const;
-        virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const;
-        //virtual Properties properties() const;
+        ID id() const override;
+        QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override;
+        //Properties properties() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index 519e8d2f..13e098db 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -72,12 +72,12 @@ namespace QPatternist
         InstanceOf(const Expression::Ptr &operand,
                    const SequenceType::Ptr &targetType);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * @returns the SequenceType that this <tt>instance of</tt> Expression
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index f2c8ccf8..23ae2094 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -78,18 +78,18 @@ namespace QPatternist
                   const Expression::Ptr &operand2,
                   const VariableDeclaration::Ptr &decl);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual SequenceType::Ptr staticType() const;
-        virtual Properties properties() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        SequenceType::Ptr staticType() const override;
+        Properties properties() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
 
     private:
         inline DynamicContext::Ptr bindVariable(const DynamicContext::Ptr &context) const;
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index 7a16e8d0..556b6624 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -77,19 +77,19 @@ namespace QPatternist
          */
         Literal(const Item &item);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
-        virtual QString description() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
+        QString description() const override;
 
         /**
          * @returns Expression::DisableElimination and Expression::IsEvaluated
          */
-        virtual Properties properties() const;
+        Properties properties() const override;
 
         /**
          * Declaring the return value of this function a const reference, leads
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index 0a4bde17..b9ad129a 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -79,14 +79,14 @@ namespace QPatternist
          */
         LiteralSequence(const Item::List &list);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual ID id() const;
+        ID id() const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
     private:
         const Item::List m_list;
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index 78aceafa..5a890137 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -69,12 +69,12 @@ namespace QPatternist
         NamespaceConstructor(const QXmlName nb);
         ~NamespaceConstructor();
 
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns a list containing one CommonSequenceTypes::ExactlyOneString instance.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * The static type is exactly one attribute node. It's unclear what
@@ -83,17 +83,17 @@ namespace QPatternist
          * conceptually correct, since a namespace node isn't an attribute
          * node.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Expression::Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Expression::Properties properties() const override;
 
         inline const QXmlName &namespaceBinding() const
         {
             return m_binding;
         }
 
-        virtual ID id() const;
+        ID id() const override;
     private:
         const QXmlName m_binding;
     };
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index dc09003d..20e130df 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -75,16 +75,16 @@ namespace QPatternist
 
         NCNameConstructor(const Expression::Ptr &source);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          *  Validates @p lexicalNCName as a processing instruction's target
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 48696e23..37d9c924 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -72,24 +72,24 @@ namespace QPatternist
                        const QXmlNodeModelIndex::DocumentOrder op,
                        const Expression::Ptr &operand2);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         virtual QXmlNodeModelIndex::DocumentOrder operatorID() const;
         /**
          * If any operator is the empty sequence, the NodeComparison rewrites
          * into that, since the empty sequence is always the result in that case.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         /**
          * @returns either CommonSequenceTypes::ZeroOrOneBoolean or
          * CommonSequenceTypes::ExactlyOneBoolean depending on the static
          * cardinality of its operands.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Determines the string representation for a node comparison operator.
@@ -101,7 +101,7 @@ namespace QPatternist
          */
         static QString displayName(const QXmlNodeModelIndex::DocumentOrder op);
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     private:
         enum Result
         {
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index 1be2469d..8561785d 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -68,12 +68,12 @@ namespace QPatternist
     public:
         NodeSortExpression(const Expression::Ptr &operand);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
 
         /**
          * Ensures that result delivered from @p operand, is in document order.
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index 2ed424a8..5a00cd5e 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
     {
     public:
         ByIDIdentifier(const Expression::ID id);
-        virtual bool matches(const Expression::Ptr &expr) const;
+        bool matches(const Expression::Ptr &expr) const override;
     private:
         const Expression::ID m_id;
     };
@@ -100,7 +100,7 @@ namespace QPatternist
          * the SequenceType passed in the BySequenceTypeIdentifier()
          * constructor, otherwise @c false.
          */
-        virtual bool matches(const Expression::Ptr &expr) const;
+        bool matches(const Expression::Ptr &expr) const override;
 
     private:
         const SequenceType::Ptr m_seqType;
@@ -135,7 +135,7 @@ namespace QPatternist
          * @returns @c true, if @p expr is a ValueComparison with the operator
          * passed in ComparisonIdentifier().
          */
-        virtual bool matches(const Expression::Ptr &expr) const;
+        bool matches(const Expression::Ptr &expr) const override;
 
     private:
         const QVector<Expression::ID> m_hosts;
@@ -156,7 +156,7 @@ namespace QPatternist
     {
     public:
         IntegerIdentifier(const xsInteger num);
-        virtual bool matches(const Expression::Ptr &expr) const;
+        bool matches(const Expression::Ptr &expr) const override;
 
     private:
         const xsInteger m_num;
@@ -175,7 +175,7 @@ namespace QPatternist
     {
     public:
         BooleanIdentifier(const bool value);
-        virtual bool matches(const Expression::Ptr &expr) const;
+        bool matches(const Expression::Ptr &expr) const override;
 
     private:
         const bool m_value;
@@ -198,9 +198,9 @@ namespace QPatternist
          * of the type that @p id identifies.
          */
         ByIDCreator(const Expression::ID id);
-        virtual Expression::Ptr create(const Expression::List &operands,
-                                       const StaticContext::Ptr &context,
-                                       const SourceLocationReflection *const r) const;
+        Expression::Ptr create(const Expression::List &operands,
+                               const StaticContext::Ptr &context,
+                               const SourceLocationReflection *const r) const override;
 
         /**
          * Creates an expression by id @p id with the arguments @p operands.
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index dcc567b7..40a0d20d 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -147,17 +147,17 @@ namespace QPatternist
                 const Expression::Ptr &operand,
                 ReturnOrderBy *const returnOrderBy);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        SequenceType::List expectedOperandTypes() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline Item::Iterator::Ptr mapToSequence(const Item &i,
                                                  const DynamicContext::Ptr &context) const;
-        virtual Properties properties() const;
+        Properties properties() const override;
 
     private:
         /**
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index eb2d2bde..3e508867 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -70,10 +70,10 @@ namespace QPatternist
         OrExpression(const Expression::Ptr &operand1,
                      const Expression::Ptr &operand2);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
 
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index 7d864a6e..ddcd8fdd 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -66,9 +66,9 @@ namespace QPatternist
     class PairContainer : public Expression
     {
     public:
-        virtual Expression::List operands() const;
-        virtual void setOperands(const Expression::List &operands);
-        virtual bool compressOperands(const StaticContext::Ptr &);
+        Expression::List operands() const override;
+        void setOperands(const Expression::List &operands) override;
+        bool compressOperands(const StaticContext::Ptr &) override;
 
     protected:
         PairContainer(const Expression::Ptr &operand1, const Expression::Ptr &operand2);
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index cede13b5..58dfde16 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -71,24 +71,24 @@ namespace QPatternist
     class ParentNodeAxis : public EmptyContainer
     {
     public:
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns always DisableElimination
          */
-        virtual Expression::Properties properties() const;
+        Expression::Properties properties() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * @returns always CommonSequenceTypes::ExactlyOneNode;
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns always BuiltinTypes::node;
          */
-        virtual ItemType::Ptr expectedContextItemType() const;
+        ItemType::Ptr expectedContextItemType() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index f3e3b59e..cab190d6 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -96,35 +96,35 @@ namespace QPatternist
              const Kind kind = RegularPath);
         ~Path();
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
         inline Item::Iterator::Ptr mapToSequence(const Item &item,
                                                  const DynamicContext::Ptr &context) const;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns the static type of the last step where the cardinality is multiplied with
          * the cardinality of the first step's cardinality.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
 
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         /**
          * @returns the item type of the last step's static type.
          */
-        virtual ItemType::Ptr newFocusType() const;
+        ItemType::Ptr newFocusType() const override;
 
-        virtual ID id() const;
+        ID id() const override;
 
         inline void setLast();
 
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index 91be948b..27288929 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
         typedef QExplicitlySharedDataPointer<PositionalVariableReference> Ptr;
         PositionalVariableReference(const VariableSlotID slot);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
         /**
          * Returns always @c true, since a positional variable is always one or more, and the
@@ -77,15 +77,15 @@ namespace QPatternist
          *
          * @returns always @c true
          */
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
 
         /**
          * @returns always CommonSequenceTypes::ExactlyOneInteger
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index 93751040..8593174c 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -71,20 +71,20 @@ namespace QPatternist
         ProcessingInstructionConstructor(const Expression::Ptr &operand1,
                            const Expression::Ptr &operand2);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Both arguments must of type @c xs:string. It is assumes that the first argument's
          * lexical space is @c xs:NCName.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
     private:
         inline QXmlName evaluateTardata(const DynamicContext::Ptr &context) const;
         /**
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index 6aab3229..49fcb07c 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -75,13 +75,13 @@ namespace QPatternist
         QNameConstructor(const Expression::Ptr &source,
                          const NamespaceResolver::Ptr &nsResolver);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * Expands @p lexicalQName, which is a lexical representation of a QName such as "x:body", into
@@ -121,7 +121,7 @@ namespace QPatternist
                                                           const StaticContext::Ptr &context,
                                                           const SourceLocationReflection *const r);
 
-        virtual const SourceLocationReflection *actualReflection() const;
+        const SourceLocationReflection *actualReflection() const override;
 
     private:
         const NamespaceResolver::Ptr m_nsResolver;
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index b4483686..29a9e268 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -78,9 +78,9 @@ namespace QPatternist
                              const Expression::Ptr &inClause,
                              const Expression::Ptr &testExpression);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
 
         Operator operatorID() const;
 
@@ -92,7 +92,7 @@ namespace QPatternist
          */
         static QString displayName(const Operator quantifier);
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         inline Item mapToItem(const Item &item, const DynamicContext::Ptr &context) const;
 
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index e5c41a13..f26cf5d9 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -73,20 +73,20 @@ namespace QPatternist
     public:
         RangeExpression(const Expression::Ptr &operand1, const Expression::Ptr &operand2);
 
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &) const override;
         /**
          * It's likely that this function gets called if staticType() inferred
          * the cardinality to an exact number. In that case, we know that the
          * first arguments is the same as the second argument.
          */
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns always CommonSequenceTypes::ZeroOrMoreIntegers
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * Disables compression for optimization reasons. For example, the
@@ -95,9 +95,9 @@ namespace QPatternist
          *
          * @returns Expression::DisableElimination
          */
-        virtual Expression::Properties properties() const;
+        Expression::Properties properties() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 85336c5f..406fe20b 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -73,17 +73,17 @@ namespace QPatternist
         RangeVariableReference(const Expression::Ptr &sourceExpression,
                                const VariableSlotID slot);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns IDRangeVariableReference
          */
-        virtual ID id() const;
+        ID id() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
     private:
         const Expression::Ptr m_sourceExpression;
     };
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index 3ea9df92..1f8b2c12 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -77,13 +77,13 @@ namespace QPatternist
                       const OrderBy::OrderSpec::Vector &oSpecs,
                       const Expression::List &operands);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
 
         inline OrderBy::OrderSpec::Vector orderSpecs() const
         {
@@ -107,7 +107,7 @@ namespace QPatternist
             m_flyAway = !a;
         }
 
-        virtual Properties properties() const;
+        Properties properties() const override;
     private:
         /**
          * This variable is unfortunately only used at compile time. However,
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 595018f2..144d0bd7 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -74,14 +74,14 @@ namespace QPatternist
     public:
         SimpleContentConstructor(const Expression::Ptr &operand);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index 6d016be2..ec12f8f3 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -67,10 +67,10 @@ namespace QPatternist
     public:
         ~SingleContainer();
 
-        virtual Expression::List operands() const;
+        Expression::List operands() const override;
 
-        virtual void setOperands(const Expression::List &operands);
-        virtual bool compressOperands(const StaticContext::Ptr &);
+        void setOperands(const Expression::List &operands) override;
+        bool compressOperands(const StaticContext::Ptr &) override;
 
     protected:
         SingleContainer(const Expression::Ptr &operand);
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index 3405aac2..20302182 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@ -111,8 +111,8 @@ namespace QPatternist
             Q_ASSERT(r);
         }
 
-        virtual const SourceLocationReflection *actualReflection() const;
-        virtual QString description() const;
+        const SourceLocationReflection *actualReflection() const override;
+        QString description() const override;
 
     private:
         const SourceLocationReflection *const m_r;
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index f0783f28..44d6e789 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -74,11 +74,11 @@ namespace QPatternist
          */
         StaticBaseURIStore(const QUrl &baseURI,
                            const Expression::Ptr &operand);
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
     private:
         const QUrl m_baseURI;
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index e3c8986d..c2ba6b1b 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -73,11 +73,11 @@ namespace QPatternist
          * absolute.
          */
         StaticCompatibilityStore(const Expression::Ptr &operand);
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual SequenceType::Ptr staticType() const;
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        SequenceType::Ptr staticType() const override;
+        SequenceType::List expectedOperandTypes() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index 5ec3ad4b..c51f4052 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -97,7 +97,7 @@ namespace QPatternist
         /**
          * Returns @c this.
          */
-        virtual const SourceLocationReflection* actualReflection() const;
+        const SourceLocationReflection* actualReflection() const override;
 
         const ImportPrecedence importPrecedence;
 
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index c389543c..934e5469 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
     class TemplateInvoker : public CallSite
     {
     public:
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         inline const WithParam::Hash &withParams() const;
         WithParam::Hash m_withParams;
@@ -90,7 +90,7 @@ namespace QPatternist
          * @see <a href="http://www.w3.org/TR/xslt20/#with-param">XSL
          * Transformations (XSLT) Version 2.0, 10.1.1 Passing Parameters to Templates</a>
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
     protected:
         /**
          * @p withParams may be empty.
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index d9e17224..2441b22f 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -69,13 +69,13 @@ namespace QPatternist
     public:
         TemplateParameterReference(const VariableDeclaration *varDecl);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual Properties properties() const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        Properties properties() const override;
 
         inline const Expression::Ptr &sourceExpression() const;
         inline const VariableDeclaration *variableDeclaration() const;
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index 7357d041..f0210658 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -70,19 +70,19 @@ namespace QPatternist
     public:
         TextNodeConstructor(const Expression::Ptr &operand);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * The first operand must be exactly one @c xs:string.
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
-        virtual Properties properties() const;
+        Properties properties() const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index f9acf69b..2d7b5418 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -90,21 +90,21 @@ namespace QPatternist
          * is verified. Then, the type the <tt>treat as</tt> expression itself must match, @p reqType,
          * is verified.
          */
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * @returns always the SequenceType passed in the constructor to this class. That is, the
          * SequenceType that the operand must conform to.
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
         /**
          * @returns a list containing one CommonSequenceTypes::ZeroOrMoreItems
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
     private:
         const SequenceType::Ptr m_reqType;
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 3fec57d3..9e9f9ab4 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -65,10 +65,10 @@ namespace QPatternist
     class TripleContainer : public Expression
     {
     public:
-        virtual Expression::List operands() const;
-        virtual void setOperands(const Expression::List &operands);
+        Expression::List operands() const override;
+        void setOperands(const Expression::List &operands) override;
 
-        virtual bool compressOperands(const StaticContext::Ptr &);
+        bool compressOperands(const StaticContext::Ptr &) override;
 
     protected:
         TripleContainer(const Expression::Ptr &operand1,
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 3362c14a..d019a0ea 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -96,8 +96,8 @@ namespace QPatternist
                 return CommonValues::emptyIterator;
         }
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        SequenceType::List expectedOperandTypes() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
     };
 }
 
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index 77da0c75..83c58702 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -96,7 +96,7 @@ namespace QPatternist
                         const Expression::Ptr &operand,
                         const StaticContext::Ptr &context);
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
     private:
         Q_DISABLE_COPY(UnaryExpression)
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index e03f6e49..80ce878b 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -73,14 +73,14 @@ namespace QPatternist
          */
         UnlimitedContainer(const Expression::List &operands = Expression::List());
 
-        virtual void setOperands(const Expression::List &list);
+        void setOperands(const Expression::List &list) override;
 
-        virtual Expression::List operands() const;
+        Expression::List operands() const override;
 
         /**
          * @note This function cannot be called before setOperands is called.
          */
-        virtual bool compressOperands(const StaticContext::Ptr &);
+        bool compressOperands(const StaticContext::Ptr &) override;
 
         /**
          * Tells how operandsUnionType() should compute the cardinality of
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index 348d73e3..aface34c 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -72,12 +72,12 @@ namespace QPatternist
     public:
         UnresolvedVariableReference(const QXmlName &name);
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual ID id() const;
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        ID id() const override;
 
         inline void bindTo(const Expression::Ptr &body);
 
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index 006540ab..5b9bf7d6 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -81,35 +81,35 @@ namespace QPatternist
         UserFunctionCallsite(const QXmlName name,
                              const FunctionSignature::Arity arity);
 
-        virtual bool evaluateEBV(const DynamicContext::Ptr &context) const;
-        virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const;
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
-        virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const;
+        bool evaluateEBV(const DynamicContext::Ptr &context) const override;
+        Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const override;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
+        void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const override;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * We call compress on our body.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
-        virtual Expression::Properties properties() const;
+        Expression::Properties properties() const override;
 
         /**
          * @short Returns the types declared in the function declaration.
          *
          * @see CallTemplate::expectedOperandTypes()
          */
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
-        virtual SequenceType::Ptr staticType() const;
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
+        SequenceType::Ptr staticType() const override;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
 
         /**
          * @returns always IDUserFunctionCallsite.
          */
-        virtual ID id() const;
+        ID id() const override;
 
         /**
          * If @p slotOffset is -1, it means this function has no arguments.
@@ -125,13 +125,13 @@ namespace QPatternist
 
         FunctionSignature::Arity arity() const;
 
-        inline Expression::Ptr body() const
+        inline Expression::Ptr body() const override
         {
             return m_body;
         }
 
-        virtual bool configureRecursion(const CallTargetDescription::Ptr &sign);
-        virtual CallTargetDescription::Ptr callTargetDescription() const;
+        bool configureRecursion(const CallTargetDescription::Ptr &sign) override;
+        CallTargetDescription::Ptr callTargetDescription() const override;
 
     private:
         /**
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index 9566dfb2..b2466a71 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -79,30 +79,30 @@ namespace QPatternist
                         const Expression::Ptr &op2);
         ~ValueComparison();
 
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &) const override;
 
-        virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context,
-                                          const SequenceType::Ptr &reqType);
+        Expression::Ptr typeCheck(const StaticContext::Ptr &context,
+                                  const SequenceType::Ptr &reqType) override;
 
         /**
          * @returns always CommonSequenceTypes::ExactlyOneBoolean
          */
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::Ptr staticType() const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
+        SequenceType::List expectedOperandTypes() const override;
 
         /**
          * @returns IDValueComparison
          */
-        virtual ID id() const;
+        ID id() const override;
 
-        virtual ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const;
-        virtual QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const;
+        ExpressionVisitorResult::Ptr accept(const ExpressionVisitor::Ptr &visitor) const override;
+        QList<QExplicitlySharedDataPointer<OptimizationPass> > optimizationPasses() const override;
 
         /**
          * Overridden to optimize case-insensitive compares.
          */
-        virtual Expression::Ptr compress(const StaticContext::Ptr &context);
+        Expression::Ptr compress(const StaticContext::Ptr &context) override;
 
         /**
          * @returns the operator that this ValueComparison is using.
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index 807b55b3..ce9c784f 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -91,7 +91,7 @@ namespace QPatternist
         /**
          * @returns DisableElimination
          */
-        virtual Properties properties() const;
+        Properties properties() const override;
 
     private:
         /**
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index afa49df0..002fcf93 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -69,10 +69,10 @@ namespace QPatternist
     {
     public:
         XSLTSimpleContentConstructor(const Expression::Ptr &source);
-        virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const;
+        Item evaluateSingleton(const DynamicContext::Ptr &context) const override;
 
-        virtual SequenceType::List expectedOperandTypes() const;
-        virtual SequenceType::Ptr staticType() const;
+        SequenceType::List expectedOperandTypes() const override;
+        SequenceType::Ptr staticType() const override;
     private:
         static inline QString processItem(const Item &item,
                                           bool &discard,