virtuals removed

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

View file

@ -97,7 +97,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Asset configuration.
inline void setAssetName(const char* pAssetName) { if (mpOwningAssetManager == NULL) mpAssetDefinition->mAssetName = StringTable->insert(pAssetName); }

View file

@ -119,8 +119,8 @@ public:
virtual ~AssetManager() {}
/// SimObject overrides
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
/// Declared assets.
@ -389,9 +389,9 @@ private:
void unloadAsset( AssetDefinition* pAssetDefinition );
/// Module callbacks.
virtual void onModulePreLoad( ModuleDefinition* pModuleDefinition );
virtual void onModulePreUnload( ModuleDefinition* pModuleDefinition );
virtual void onModulePostUnload( ModuleDefinition* pModuleDefinition );
void onModulePreLoad( ModuleDefinition* pModuleDefinition ) override;
void onModulePreUnload( ModuleDefinition* pModuleDefinition ) override;
void onModulePostUnload( ModuleDefinition* pModuleDefinition ) override;
};
//-----------------------------------------------------------------------------

View file

@ -155,7 +155,7 @@ public:
}
/// Referencing.
virtual void clear( void )
void clear( void ) override
{
// Do we have an asset?
if ( notNull() )
@ -171,14 +171,14 @@ public:
T* operator->( void ) const { return mpAsset; }
T& operator*( void ) const { return *mpAsset; }
operator T*( void ) const { return mpAsset; }
virtual void setAssetId( const char* pAssetId ) { *this = pAssetId; }
virtual StringTableEntry getAssetId( void ) const { return isNull() ? StringTable->EmptyString() : mpAsset->getAssetId(); }
virtual StringTableEntry getAssetType(void) const { return isNull() ? StringTable->EmptyString() : mpAsset->getClassName(); }
virtual bool isAssetId( const char* pAssetId ) const { return pAssetId == NULL ? isNull() : getAssetId() == StringTable->insert(pAssetId); }
void setAssetId( const char* pAssetId ) override { *this = pAssetId; }
StringTableEntry getAssetId( void ) const override { return isNull() ? StringTable->EmptyString() : mpAsset->getAssetId(); }
StringTableEntry getAssetType(void) const override { return isNull() ? StringTable->EmptyString() : mpAsset->getClassName(); }
bool isAssetId( const char* pAssetId ) const override { return pAssetId == NULL ? isNull() : getAssetId() == StringTable->insert(pAssetId); }
/// Validity.
virtual bool isNull( void ) const { return mpAsset.isNull(); }
virtual bool notNull( void ) const { return !mpAsset.isNull(); }
bool isNull( void ) const override { return mpAsset.isNull(); }
bool notNull( void ) const override { return !mpAsset.isNull(); }
};
#endif // _ASSET_PTR_H_

View file

@ -53,8 +53,8 @@ private:
typedef SimObject Parent;
protected:
virtual void onTamlCustomWrite( TamlCustomNodes& customNodes );
virtual void onTamlCustomRead( const TamlCustomNodes& customNodes );
void onTamlCustomWrite( TamlCustomNodes& customNodes ) override;
void onTamlCustomRead( const TamlCustomNodes& customNodes ) override;
static const char* getCount(void* obj, const char* data) { return Con::getIntArg(static_cast<AssetQuery*>(obj)->mAssetList.size()); }
static bool writeCount( void* obj, StringTableEntry pFieldName ) { return false; }

View file

@ -120,8 +120,8 @@ private:
void renameAssetId( const char* pAssetIdFrom, const char* pAssetIdTo );
protected:
virtual void onTamlCustomWrite( TamlCustomNodes& customNodes );
virtual void onTamlCustomRead( const TamlCustomNodes& customNodes );
void onTamlCustomWrite( TamlCustomNodes& customNodes ) override;
void onTamlCustomRead( const TamlCustomNodes& customNodes ) override;
public:
AssetTagsManifest();