TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

virtuals removed

Browse source 
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:13:00 +00:00
parent 88a43f3137
commit efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/console/consoleObject.h
View file

@ -554,8 +554,8 @@ public:
/// @name Console Type Interface
/// @{
virtual void* getNativeVariable() { return new ( AbstractClassRep* ); } // Any pointer-sized allocation will do.
virtual void deleteNativeVariable( void* var ) { delete reinterpret_cast< AbstractClassRep** >( var ); }
void* getNativeVariable() override { return new ( AbstractClassRep* ); } // Any pointer-sized allocation will do.
void deleteNativeVariable( void* var ) override { delete reinterpret_cast< AbstractClassRep** >( var ); }
/// @}
@ -603,7 +603,7 @@ class ConcreteAbstractClassRep : public AbstractClassRep
{
public:
virtual AbstractClassRep* getContainerChildClass(const bool recurse)
AbstractClassRep* getContainerChildClass(const bool recurse) override
{
// Fetch container children type.
AbstractClassRep* pChildren = T::getContainerChildStaticClassRep();
@ -619,7 +619,7 @@ public:
return pParent->getContainerChildClass(recurse);
}
virtual WriteCustomTamlSchema getCustomTamlSchema(void)
WriteCustomTamlSchema getCustomTamlSchema(void) override
{
return T::getStaticWriteCustomTamlSchema();
}
@ -663,12 +663,12 @@ public:
};
/// Wrap constructor.
ConsoleObject* create() const { return NULL; }
ConsoleObject* create() const override { return NULL; }
/// Perform class specific initialization tasks.
///
/// Link namespaces, call initPersistFields() and consoleInit().
void init()
void init() override
{
// Get handle to our parent class, if any, and ourselves (we are our parent's child).
AbstractClassRep *parent = T::getParentStaticClassRep();
@ -712,7 +712,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)
{
@ -723,14 +723,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; };
/// @}
};
@ -752,7 +752,7 @@ public:
}
/// Wrap constructor.
ConsoleObject* create() const { return new T; }
ConsoleObject* create() const override { return new T; }
};
template< typename T > EnginePropertyTable ConcreteAbstractClassRep< T >::_smPropertyTable(0, NULL);

8
Engine/source/console/dynamicTypes.h
View file

@ -174,7 +174,7 @@ class EnumConsoleBaseType : public ConsoleBaseType
public:
virtual const char* getData(void *dptr, const EnumTable *tbl, BitSet32 flag)
const char* getData(void *dptr, const EnumTable *tbl, BitSet32 flag) override
{
S32 dptrVal = *( S32* ) dptr;
if( !tbl ) tbl = getEnumTable();
@ -184,7 +184,7 @@ class EnumConsoleBaseType : public ConsoleBaseType
return ( *tbl )[ i ].mName;
return "";
}
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 ) return;
if( !tbl ) tbl = getEnumTable();
@ -214,14 +214,14 @@ class BitfieldConsoleBaseType : public ConsoleBaseType
public:
virtual const char* getData( void* dptr, const EnumTable*, BitSet32 )
const char* getData( void* dptr, const EnumTable*, BitSet32 ) override
{
static const U32 bufSize = 256;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf(returnBuffer, bufSize, "0x%08x", *((S32 *) dptr) );
return returnBuffer;
}
virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 )
void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) override
{
if( argc != 1 ) return; \
*((S32 *) dptr) = dAtoui(argv[0],0); \

2
Engine/source/console/engineAPI.h
View file

@ -294,7 +294,7 @@ struct EngineUnmarshallData< ConsoleValue >
{
ConsoleValue operator()( ConsoleValue ref ) const
{
return std::move(ref);
return ref;
}
};

8
Engine/source/console/engineObject.h
View file

@ -485,8 +485,8 @@ class EngineCRuntimeObjectPool : public IEngineObjectPool
static EngineCRuntimeObjectPool* instance() { return &smInstance; }
// IEngineObjectPool
virtual void* allocateObject(size_t size TORQUE_TMM_ARGS_DECL );
virtual void freeObject( void* ptr );
void* allocateObject(size_t size TORQUE_TMM_ARGS_DECL ) override;
void freeObject( void* ptr ) override;
};
@ -569,7 +569,7 @@ class EngineObject : public StrongRefBase
IEngineObjectPool* getEngineObjectPool() const { return mEngineObjectPool; }
// StrongRefBase
virtual void destroySelf();
void destroySelf() override;
#ifdef TORQUE_DEBUG
@ -653,7 +653,7 @@ class StaticEngineObject : public EngineObject
StaticEngineObject();
// EngineObject.
virtual void destroySelf();
void destroySelf() override;
};

12
Engine/source/console/engineTypeInfo.h
View file

@ -538,14 +538,14 @@ class EngineSimpleTypeInfo : public EngineTypeInfo
mTypeFlags.set( EngineTypeInstantiable );
}
virtual bool constructInstance( void* ptr ) const
bool constructInstance( void* ptr ) const override
{
T* p = reinterpret_cast< T* >( ptr );
*p = T();
return true;
}
virtual void destructInstance( void* ptr ) const
void destructInstance( void* ptr ) const override
{
// Nothing to do.
}
@ -567,14 +567,14 @@ class EngineStructTypeInfo : public EngineTypeInfo
mTypeFlags.set( EngineTypeInstantiable );
}
virtual bool constructInstance( void* ptr ) const
bool constructInstance( void* ptr ) const override
{
T* p = reinterpret_cast< T* >( ptr );
*p = T();
return true;
}
virtual void destructInstance( void* ptr ) const
void destructInstance( void* ptr ) const override
{
T* p = reinterpret_cast< T* >( ptr );
destructInPlace( p );
@ -609,12 +609,12 @@ class EngineClassTypeInfo : public EngineTypeInfo
mTypeFlags.set( EngineTypeSingleton );
}
virtual bool constructInstance( void* ptr ) const
bool constructInstance( void* ptr ) const override
{
return Base::_construct( ptr );
}
virtual void destructInstance( void* ptr ) const
void destructInstance( void* ptr ) const override
{
return Base::_destruct( ptr );
}

4
Engine/source/console/persistenceManager.h
View file

@ -280,8 +280,8 @@ public:
PersistenceManager();
virtual ~PersistenceManager();
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
// Adds an object to the dirty list
// Optionally changes the object's filename

2
Engine/source/console/script.h
View file

@ -14,7 +14,7 @@ namespace Con
gLastEvalResult.valid = pLastEvalResult.valid;
gLastEvalResult.error = pLastEvalResult.error;
gLastEvalResult.value.setString(pLastEvalResult.value.getString());
return std::move(pLastEvalResult);
return pLastEvalResult;
}
inline EvalResult getLastEvalResult() { return setLastEvalResult(std::move(gLastEvalResult)); };

6
Engine/source/console/simDatablock.h
View file

@ -137,8 +137,8 @@ public:
/// Get the modified key for this particular datablock.
S32 getModifiedKey() const { return modifiedKey; }
bool onAdd();
virtual void onStaticModified(const char* slotName, const char*newValue = NULL);
bool onAdd() override;
void onStaticModified(const char* slotName, const char*newValue = NULL) override;
//void setLastError(const char*);
void assignId();
@ -171,7 +171,7 @@ public:
/// @param flags If SelectedOnly is passed here, then
/// only objects marked as selected (using setSelected)
/// will output themselves.
virtual void write(Stream &stream, U32 tabStop, U32 flags = 0);
void write(Stream &stream, U32 tabStop, U32 flags = 0) override;
/// Used by the console system to automatically tell datablock classes apart
/// from non-datablock classes.

6
Engine/source/console/simEvents.h
View file

@ -111,7 +111,7 @@ public:
SimConsoleEvent(S32 argc, ConsoleValue *argv, bool onObject);
~SimConsoleEvent();
virtual void process(SimObject *object);
void process(SimObject *object) override;
/// Creates a reference to our internal args list in argv
void populateArgs(ConsoleValue *argv);
@ -140,7 +140,7 @@ public:
SimConsoleThreadExecEvent(S32 argc, ConsoleValue *argv, bool onObject, SimConsoleThreadExecCallback *callback);
SimConsoleThreadExecCallback& getCB() { return *cb; }
virtual void process(SimObject *object);
void process(SimObject *object) override;
};
/// General purpose SimEvent which calls a Delegate<void()> callback.
@ -151,7 +151,7 @@ public:
U32 *mEventId;
Delegate<void()> mCallback;
void process( SimObject* )
void process( SimObject* ) override
{
// Clear the event id and call the delegate.
*mEventId = InvalidEventId;

22
Engine/source/console/simObject.h
View file

@ -391,13 +391,13 @@ class SimObject: public ConsoleObject, public TamlCallbacks
static bool _doPrototype(void* object, const char* index, const char* data);
protected:
/// Taml callbacks.
virtual void onTamlPreWrite(void) {}
virtual void onTamlPostWrite(void) {}
virtual void onTamlPreRead(void) {}
virtual void onTamlPostRead(const TamlCustomNodes& customNodes) {}
virtual void onTamlAddParent(SimObject* pParentObject) {}
virtual void onTamlCustomWrite(TamlCustomNodes& customNodes) {}
virtual void onTamlCustomRead(const TamlCustomNodes& customNodes);
void onTamlPreWrite(void) override {}
void onTamlPostWrite(void) override {}
void onTamlPreRead(void) override {}
void onTamlPostRead(const TamlCustomNodes& customNodes) override {}
void onTamlAddParent(SimObject* pParentObject) override {}
void onTamlCustomWrite(TamlCustomNodes& customNodes) override {}
void onTamlCustomRead(const TamlCustomNodes& customNodes) override;
/// Id number for this object.
SimObjectId mId;
@ -454,7 +454,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
virtual void _onUnselected() {}
/// We can provide more detail, like object name and id.
virtual String _getLogMessage(const char* fmt, va_list args) const;
String _getLogMessage(const char* fmt, va_list args) const override;
DEFINE_CREATE_METHOD
{
@ -465,7 +465,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
// EngineObject.
virtual void _destroySelf();
void _destroySelf() override;
public:
@ -952,7 +952,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
/// @{
/// Return a textual description of the object.
virtual String describeSelf() const;
String describeSelf() const override;
/// Dump the contents of this object to the console. Use the Torque Script dump() and dumpF() functions to
/// call this.
@ -993,7 +993,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks
}
// EngineObject.
virtual void destroySelf();
void destroySelf() override;
protected:
bool is_temp_clone;
public:

12
Engine/source/console/simObjectRef.h
View file

@ -137,14 +137,14 @@ public:
public:
virtual const char* getData( void *dptr, const EnumTable*, BitSet32 )
const char* getData( void *dptr, const EnumTable*, BitSet32 ) override
{
SimObjectRef<T> *objRef = static_cast< SimObjectRef<T>* >( dptr );
T *obj = *objRef;
return T::__getObjectId( obj );
}
virtual void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 )
void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) override
{
SimObjectRef<T> *objRef = static_cast< SimObjectRef<T>* >( dptr );
@ -154,23 +154,23 @@ public:
*objRef = argv[0];
}
virtual const bool isDatablock()
const bool isDatablock() override
{
return T::__smIsDatablock;
};
virtual const char* getTypeClassName()
const char* getTypeClassName() override
{
return T::getStaticClassRep()->getClassName();
}
virtual void* getNativeVariable()
void* getNativeVariable() override
{
SimObjectRef<T> *var = new SimObjectRef<T>();
return (void*)var;
}
virtual void deleteNativeVariable( void *var )
void deleteNativeVariable( void *var ) override
{
SimObjectRef<T> *nativeVar = reinterpret_cast< SimObjectRef<T>* >( var );
delete nativeVar;

40
Engine/source/console/simSet.h
View file

@ -271,24 +271,24 @@ class SimSet : public SimObject, public TamlChildren
// SimObject.
DECLARE_CONOBJECT( SimSet );
virtual void onRemove();
virtual void onDeleteNotify(SimObject *object);
void onRemove() override;
void onDeleteNotify(SimObject *object) override;
virtual SimObject* findObject( const char* name );
SimObject* findObject( const char* name ) override;
virtual void write(Stream &stream, U32 tabStop, U32 flags = 0);
virtual bool writeObject(Stream *stream);
virtual bool readObject(Stream *stream);
void write(Stream &stream, U32 tabStop, U32 flags = 0) override;
bool writeObject(Stream *stream) override;
bool readObject(Stream *stream) override;
virtual SimSet* clone();
SimSet* clone() override;
// TamlChildren
virtual U32 getTamlChildCount(void) const
U32 getTamlChildCount(void) const override
{
return (U32)size();
}
virtual SimObject* getTamlChild(const U32 childIndex) const
SimObject* getTamlChild(const U32 childIndex) const override
{
// Sanity!
AssertFatal(childIndex < (U32)size(), "SimSet::getTamlChild() - Child index is out of range.");
@ -300,7 +300,7 @@ class SimSet : public SimObject, public TamlChildren
return at(childIndex);
}
virtual void addTamlChild(SimObject* pSimObject)
void addTamlChild(SimObject* pSimObject) override
{
// Sanity!
AssertFatal(pSimObject != NULL, "SimSet::addTamlChild() - Cannot add a NULL child object.");
@ -452,19 +452,19 @@ class SimGroup: public SimSet
void addObject( SimObject* object, const char* name );
// SimSet.
virtual void addObject( SimObject* object );
virtual void removeObject( SimObject* object );
virtual void pushObject( SimObject* object );
virtual void popObject();
virtual void clear();
void addObject( SimObject* object ) override;
void removeObject( SimObject* object ) override;
void pushObject( SimObject* object ) override;
void popObject() override;
void clear() override;
virtual SimGroup* clone();
virtual SimGroup* deepClone();
SimGroup* clone() override;
SimGroup* deepClone() override;
virtual SimObject* findObject(const char* name);
virtual void onRemove();
SimObject* findObject(const char* name) override;
void onRemove() override;
virtual bool processArguments( S32 argc, ConsoleValue *argv );
bool processArguments( S32 argc, ConsoleValue *argv ) override;
virtual SimObject* getObject(const S32& index);

8
Engine/source/console/typeValidators.h
View file

@ -53,7 +53,7 @@ public:
minV = minValue;
maxV = maxValue;
}
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
F32 getMin() { return minV; };
F32 getMax() { return maxV; };
};
@ -68,7 +68,7 @@ public:
minV = minValue;
maxV = maxValue;
}
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
F32 getMin() { return minV; };
F32 getMax() { return maxV; };
};
@ -88,7 +88,7 @@ public:
maxV = maxValueScaled;
factor = scaleFactor;
}
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
};
/// Vector normalization validator
@ -97,7 +97,7 @@ class Point3NormalizeValidator : public TypeValidator
F32 length;
public:
Point3NormalizeValidator(F32 normalizeLength = 1.0f) : length(normalizeLength) { }
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
F32 getLength() { return length; };
};