rest of virtuals removed

virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.

Engine/source/console/SimXMLDocument.h

@@ -56,9 +56,9 @@ class SimXMLDocument: public SimObject
       // tie in to the script language.  The .cc file has more in depth
       // comments on these.
       //-----------------------------------------------------------------------
-      bool processArguments(S32 argc, ConsoleValue *argv);
-      bool onAdd();
-      void onRemove();
+      bool processArguments(S32 argc, ConsoleValue *argv) override;
+      bool onAdd() override;
+      void onRemove() override;
       static void initPersistFields();
       
       // Set this to default state at construction.

Engine/source/console/consoleLogger.h

@@ -81,7 +81,7 @@ class ConsoleLogger : public SimObject
       /// // Example script constructor usage.
       /// %obj = new ConsoleLogger( objName, logFileName, [append = false] );
       /// @endcode
-      bool processArguments( S32 argc, ConsoleValue *argv );
+      bool processArguments( S32 argc, ConsoleValue *argv ) override;
 
       /// Default constructor, make sure to initalize
       ConsoleLogger();

Engine/source/console/fieldBrushObject.h

@@ -71,7 +71,7 @@ public:
     StringTableEntry getSortName(void) const     { return mSortName; }
 
     static void initPersistFields();                    ///< Persist Fields.
-    virtual void onRemove();                            ///< Called when the object is removed from the sim.
+    void onRemove() override;                            ///< Called when the object is removed from the sim.
 
     DECLARE_CONOBJECT(FieldBrushObject);
 };

Engine/source/console/runtimeClassRep.h

@@ -60,7 +60,7 @@ public:
       parentClass     = parent;
    };
 
-   virtual AbstractClassRep* getContainerChildClass(const bool recurse)
+   AbstractClassRep* getContainerChildClass(const bool recurse) override
    {
       // Fetch container children type.
       AbstractClassRep* pChildren = T::getContainerChildStaticClassRep();
@@ -76,7 +76,7 @@ public:
       return pParent->getContainerChildClass(recurse);
    }
 
-   virtual WriteCustomTamlSchema getCustomTamlSchema(void)
+   WriteCustomTamlSchema getCustomTamlSchema(void) override
    {
       return T::getStaticWriteCustomTamlSchema();
    }
@@ -100,7 +100,7 @@ public:
    }
 
    /// Wrap constructor.
-   ConsoleObject *create() const { return new T; }
+   ConsoleObject *create() const override { return new T; }
 
    //-----------------------------------------------------------------------------
 
@@ -148,7 +148,7 @@ public:
    /// @name Console Type Interface
    /// @{
 
-   virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag )
+   void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 flag ) override
    {
       if( argc == 1 )
       {
@@ -159,14 +159,14 @@ public:
          Con::errorf( "Cannot set multiple args to a single ConsoleObject*.");
    }
    
-   virtual const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag )
+   const char* getData( void* dptr, const EnumTable* tbl, BitSet32 flag ) override
    {
       T** obj = ( T** ) dptr;
       return Con::getReturnBuffer( T::__getObjectId( *obj ) );
    }
    
-   virtual const char* getTypeClassName() { return mClassName; }
-   virtual const bool isDatablock() { return T::__smIsDatablock; };
+   const char* getTypeClassName() override { return mClassName; }
+   const bool isDatablock() override { return T::__smIsDatablock; };
    
    /// @}
 };

Engine/source/console/scriptObjects.h

@@ -41,8 +41,8 @@ class ScriptObject : public SimObject
 
 public:
    ScriptObject();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    DECLARE_CONOBJECT(ScriptObject);
 
@@ -64,12 +64,12 @@ protected:
 public:
    ScriptTickObject();
    static void initPersistFields();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
-   virtual void interpolateTick( F32 delta );
-   virtual void processTick();
-   virtual void advanceTime( F32 timeDelta );
+   void interpolateTick( F32 delta ) override;
+   void processTick() override;
+   void advanceTime( F32 timeDelta ) override;
 
    DECLARE_CONOBJECT(ScriptTickObject);
 
@@ -88,8 +88,8 @@ class ScriptGroup : public SimGroup
    
 public:
    ScriptGroup();
-   bool onAdd();
-   void onRemove();
+   bool onAdd() override;
+   void onRemove() override;
 
    DECLARE_CONOBJECT(ScriptGroup);
 

Engine/source/console/simObject.cpp

@@ -751,7 +751,7 @@ void SimObject::destroySelf()
 class SimObjectDeleteEvent : public SimEvent
 {
 public:
-   void process(SimObject *object)
+   void process(SimObject *object) override
    {
       object->deleteObject();
    }

Engine/source/console/simPersistSet.h

@@ -56,9 +56,9 @@ class SimPersistSet : public SimSet
       void resolvePIDs();
 
       // SimSet.
-      virtual void addObject( SimObject* );
-      virtual void write( Stream &stream, U32 tabStop, U32 flags = 0 );
-      virtual bool processArguments( S32 argc, ConsoleValue *argv );
+      void addObject( SimObject* ) override;
+      void write( Stream &stream, U32 tabStop, U32 flags = 0 ) override;
+      bool processArguments( S32 argc, ConsoleValue *argv ) override;
       
       DECLARE_CONOBJECT( SimPersistSet );
       DECLARE_CATEGORY( "Console" );

Engine/source/console/torquescript/ast.h

@@ -110,7 +110,7 @@ struct BreakStmtNode : StmtNode
    static BreakStmtNode* alloc(S32 lineNumber);
 
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(BreakStmtNode);
 };
 
@@ -118,7 +118,7 @@ struct ContinueStmtNode : StmtNode
 {
    static ContinueStmtNode* alloc(S32 lineNumber);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(ContinueStmtNode);
 };
 
@@ -127,7 +127,7 @@ struct ExprNode : StmtNode
 {
    ExprNode* optimizedNode;
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
 
    virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) = 0;
    virtual TypeReq getPreferredType() = 0;
@@ -140,7 +140,7 @@ struct ReturnStmtNode : StmtNode
 
    static ReturnStmtNode* alloc(S32 lineNumber, ExprNode* expr);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(ReturnStmtNode);
 };
 
@@ -157,7 +157,7 @@ struct IfStmtNode : StmtNode
    void propagateSwitchExpr(ExprNode* left, bool string);
    ExprNode* getSwitchOR(ExprNode* left, ExprNode* list, bool string);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(IfStmtNode);
 };
 
@@ -175,7 +175,7 @@ struct LoopStmtNode : StmtNode
 
    static LoopStmtNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* initExpr, ExprNode* endLoopExpr, StmtNode* loopBlock, bool isDoLoop);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(LoopStmtNode);
 };
 
@@ -199,7 +199,7 @@ struct IterStmtNode : StmtNode
 
    static IterStmtNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* containerExpr, StmtNode* body, bool isStringIter);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
 };
 
 /// A binary mathematical expression (ie, left op right).
@@ -214,11 +214,11 @@ struct FloatBinaryExprNode : BinaryExprNode
 {
    static FloatBinaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* left, ExprNode* right);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
 
    bool optimize();
 
-   TypeReq getPreferredType();
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FloatBinaryExprNode);
 };
 
@@ -230,8 +230,8 @@ struct ConditionalExprNode : ExprNode
    bool integer;
    static ConditionalExprNode* alloc(S32 lineNumber, ExprNode* testExpr, ExprNode* trueExpr, ExprNode* falseExpr);
 
-   virtual U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   virtual TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ConditionalExprNode);
 };
 
@@ -246,8 +246,8 @@ struct IntBinaryExprNode : BinaryExprNode
 
    bool optimize();
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(IntBinaryExprNode);
 };
 
@@ -256,8 +256,8 @@ struct StreqExprNode : BinaryExprNode
    bool eq;
    static StreqExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, bool eq);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StreqExprNode);
 };
 
@@ -266,8 +266,8 @@ struct StrcatExprNode : BinaryExprNode
    S32 appendChar;
    static StrcatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right, S32 appendChar);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StrcatExprNode);
 };
 
@@ -276,8 +276,8 @@ struct CommaCatExprNode : BinaryExprNode
    static CommaCatExprNode* alloc(S32 lineNumber, ExprNode* left, ExprNode* right);
 
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(CommaCatExprNode);
 };
 
@@ -289,8 +289,8 @@ struct IntUnaryExprNode : ExprNode
 
    static IntUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(IntUnaryExprNode);
 };
 
@@ -301,8 +301,8 @@ struct FloatUnaryExprNode : ExprNode
 
    static FloatUnaryExprNode* alloc(S32 lineNumber, S32 op, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FloatUnaryExprNode);
 };
 
@@ -313,9 +313,9 @@ struct VarNode : ExprNode
 
    static VarNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameVarNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameVarNode; }
    DBG_STMT_TYPE(VarNode);
 };
 
@@ -326,9 +326,9 @@ struct IntNode : ExprNode
 
    static IntNode* alloc(S32 lineNumber, S32 value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameIntNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameIntNode; }
    DBG_STMT_TYPE(IntNode);
 };
 
@@ -339,9 +339,9 @@ struct FloatNode : ExprNode
 
    static FloatNode* alloc(S32 lineNumber, F64 value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
-   virtual ExprNodeName getExprNodeNameEnum() const { return NameFloatNode; }
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
+   ExprNodeName getExprNodeNameEnum() const override { return NameFloatNode; }
    DBG_STMT_TYPE(FloatNode);
 };
 
@@ -355,8 +355,8 @@ struct StrConstNode : ExprNode
 
    static StrConstNode* alloc(S32 lineNumber, const char* str, bool tag, bool doc = false);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(StrConstNode);
 };
 
@@ -368,8 +368,8 @@ struct ConstantNode : ExprNode
 
    static ConstantNode* alloc(S32 lineNumber, StringTableEntry value);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ConstantNode);
 };
 
@@ -382,8 +382,8 @@ struct AssignExprNode : ExprNode
 
    static AssignExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssignExprNode);
 };
 
@@ -406,8 +406,8 @@ struct AssignOpExprNode : ExprNode
 
    static AssignOpExprNode* alloc(S32 lineNumber, StringTableEntry varName, ExprNode* arrayIndex, ExprNode* expr, S32 op);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssignOpExprNode);
 };
 
@@ -419,7 +419,7 @@ struct TTagSetStmtNode : StmtNode
 
    static TTagSetStmtNode* alloc(S32 lineNumber, StringTableEntry tag, ExprNode* valueExpr, ExprNode* stringExpr);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
    DBG_STMT_TYPE(TTagSetStmtNode);
 };
 
@@ -429,8 +429,8 @@ struct TTagDerefNode : ExprNode
 
    static TTagDerefNode* alloc(S32 lineNumber, ExprNode* expr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(TTagDerefNode);
 };
 
@@ -440,8 +440,8 @@ struct TTagExprNode : ExprNode
 
    static TTagExprNode* alloc(S32 lineNumber, StringTableEntry tag);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(TTagExprNode);
 };
 
@@ -460,8 +460,8 @@ struct FuncCallExprNode : ExprNode
 
    static FuncCallExprNode* alloc(S32 lineNumber, StringTableEntry funcName, StringTableEntry nameSpace, ExprNode* args, bool dot);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(FuncCallExprNode);
 };
 
@@ -473,8 +473,8 @@ struct AssertCallExprNode : ExprNode
 
    static AssertCallExprNode* alloc(S32 lineNumber, ExprNode* testExpr, const char* message);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(AssertCallExprNode);
 };
 
@@ -493,8 +493,8 @@ struct SlotAccessNode : ExprNode
 
    static SlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAccessNode);
 };
 
@@ -513,8 +513,8 @@ struct InternalSlotAccessNode : ExprNode
 
    static InternalSlotAccessNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* slotExpr, bool recurse);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(InternalSlotAccessNode);
 };
 
@@ -527,8 +527,8 @@ struct SlotAssignNode : ExprNode
 
    static SlotAssignNode* alloc(S32 lineNumber, ExprNode* objectExpr, ExprNode* arrayExpr, StringTableEntry slotName, ExprNode* valueExpr, U32 typeID = -1);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAssignNode);
 };
 
@@ -543,8 +543,8 @@ struct SlotAssignOpNode : ExprNode
 
    static SlotAssignOpNode* alloc(S32 lineNumber, ExprNode* objectExpr, StringTableEntry slotName, ExprNode* arrayExpr, S32 op, ExprNode* valueExpr);
 
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
-   TypeReq getPreferredType();
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(SlotAssignOpNode);
 };
 
@@ -564,9 +564,9 @@ struct ObjectDeclNode : ExprNode
    static ObjectDeclNode* alloc(S32 lineNumber, ExprNode* classNameExpr, ExprNode* objectNameExpr, ExprNode* argList, StringTableEntry parentObject, SlotAssignNode* slotDecls, ObjectDeclNode* subObjects, bool isDatablock, bool classNameInternal, bool isSingleton);
 
    U32 precompileSubObject(bool);
-   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type);
+   U32 compile(CodeStream& codeStream, U32 ip, TypeReq type) override;
    U32 compileSubObject(CodeStream& codeStream, U32 ip, bool);
-   TypeReq getPreferredType();
+   TypeReq getPreferredType() override;
    DBG_STMT_TYPE(ObjectDeclNode);
 };
 
@@ -588,8 +588,8 @@ struct FunctionDeclStmtNode : StmtNode
 
    static FunctionDeclStmtNode* alloc(S32 lineNumber, StringTableEntry fnName, StringTableEntry nameSpace, VarNode* args, StmtNode* stmts);
 
-   U32 compileStmt(CodeStream& codeStream, U32 ip);
-   void setPackage(StringTableEntry packageName);
+   U32 compileStmt(CodeStream& codeStream, U32 ip) override;
+   void setPackage(StringTableEntry packageName) override;
    DBG_STMT_TYPE(FunctionDeclStmtNode);
 };