mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-26 23:05:38 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -105,11 +105,11 @@ class SFXAmbience : public SimDataBlock
|
|||
static ChangeSignal& getChangeSignal() { return smChangeSignal; }
|
||||
|
||||
// SimDataBlock.
|
||||
virtual bool onAdd();
|
||||
virtual void packData( BitStream* stream );
|
||||
virtual void unpackData( BitStream* stream );
|
||||
virtual bool preload( bool server, String& errorStr );
|
||||
virtual void inspectPostApply();
|
||||
bool onAdd() override;
|
||||
void packData( BitStream* stream ) override;
|
||||
void unpackData( BitStream* stream ) override;
|
||||
bool preload( bool server, String& errorStr ) override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
|
|||
|
|
@ -227,10 +227,10 @@ class SFXBuffer : public StrongRefBase,
|
|||
void load();
|
||||
|
||||
// IPolled.
|
||||
virtual bool update();
|
||||
bool update() override;
|
||||
|
||||
// WeakRefBase.
|
||||
virtual void destroySelf();
|
||||
void destroySelf() override;
|
||||
};
|
||||
|
||||
#endif // _SFXBUFFER_H_
|
||||
|
|
|
|||
|
|
@ -188,17 +188,17 @@ class SFXDescription : public SimDataBlock
|
|||
static void initPersistFields();
|
||||
|
||||
// SimDataBlock.
|
||||
virtual bool onAdd();
|
||||
virtual void packData( BitStream* stream );
|
||||
virtual void unpackData( BitStream* stream );
|
||||
virtual void inspectPostApply();
|
||||
bool onAdd() override;
|
||||
void packData( BitStream* stream ) override;
|
||||
void unpackData( BitStream* stream ) override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
/// Validates the description fixing any
|
||||
/// parameters that are out of range.
|
||||
void validate();
|
||||
public:
|
||||
SFXDescription(const SFXDescription&, bool);
|
||||
virtual bool allowSubstitutions() const { return true; }
|
||||
bool allowSubstitutions() const override { return true; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -157,8 +157,8 @@ class SFXParameter : public SimObject
|
|||
EventSignal& getEventSignal() { return mEventSignal; }
|
||||
|
||||
// SimObject.
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
|
|||
|
|
@ -338,12 +338,12 @@ class SFXPlayList : public SFXTrack
|
|||
virtual bool isLooping() const;
|
||||
|
||||
// SimDataBlock.
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
virtual bool preload( bool server, String& errorStr );
|
||||
virtual void packData( BitStream* stream );
|
||||
virtual void unpackData( BitStream* stream );
|
||||
virtual void inspectPostApply();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
bool preload( bool server, String& errorStr ) override;
|
||||
void packData( BitStream* stream ) override;
|
||||
void unpackData( BitStream* stream ) override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
static void initPersistFields();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -148,10 +148,10 @@ class SFXProfile : public SFXTrack
|
|||
virtual bool isLooping() const;
|
||||
|
||||
// SimObject
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
void packData( BitStream* stream );
|
||||
void unpackData( BitStream* stream );
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
void packData( BitStream* stream ) override;
|
||||
void unpackData( BitStream* stream ) override;
|
||||
|
||||
/// Returns the sound filename.
|
||||
const String getSoundFileName() const { return mFilename; }
|
||||
|
|
@ -162,7 +162,7 @@ class SFXProfile : public SFXTrack
|
|||
|
||||
/// @note This has nothing to do with mPreload.
|
||||
/// @see SimDataBlock::preload
|
||||
bool preload( bool server, String &errorStr );
|
||||
bool preload( bool server, String &errorStr ) override;
|
||||
|
||||
/// Returns the sound resource loading it from
|
||||
/// disk if it hasn't been preloaded.
|
||||
|
|
@ -187,8 +187,8 @@ class SFXProfile : public SFXTrack
|
|||
public:
|
||||
/*C*/ SFXProfile(const SFXProfile&, bool = false);
|
||||
SFXProfile* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
|
||||
virtual void onPerformSubstitutions();
|
||||
virtual bool allowSubstitutions() const { return true; }
|
||||
void onPerformSubstitutions() override;
|
||||
bool allowSubstitutions() const override { return true; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ class SFXSource : public SimGroup
|
|||
|
||||
/// We overload this to disable creation of
|
||||
/// a source via script 'new'.
|
||||
virtual bool processArguments( S32 argc, ConsoleValue *argv );
|
||||
bool processArguments( S32 argc, ConsoleValue *argv ) override;
|
||||
|
||||
// Console getters/setters.
|
||||
static bool _setDescription( void *obj, const char *index, const char *data );
|
||||
|
|
@ -643,11 +643,11 @@ class SFXSource : public SimGroup
|
|||
/// @}
|
||||
|
||||
// SimGroup.
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
virtual void onDeleteNotify( SimObject* object );
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
void onDeleteNotify( SimObject* object ) override;
|
||||
virtual bool acceptsAsChild( SimObject* object );
|
||||
virtual void onGroupAdd();
|
||||
void onGroupAdd() override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class SFXTrack : public SimDataBlock
|
|||
StringTableEntry mParameters[ MaxNumParameters ];
|
||||
|
||||
/// Overload this to disable direct instantiation of this class via script 'new'.
|
||||
virtual bool processArguments( S32 argc, ConsoleValue *argv );
|
||||
bool processArguments( S32 argc, ConsoleValue *argv ) override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -86,11 +86,11 @@ class SFXTrack : public SimDataBlock
|
|||
void setParameter( U32 index, const char* name );
|
||||
|
||||
// SimDataBlock.
|
||||
virtual void packData( BitStream* stream );
|
||||
virtual void unpackData( BitStream* stream );
|
||||
virtual bool preload( bool server, String& errorStr );
|
||||
virtual bool onAdd();
|
||||
virtual void inspectPostApply();
|
||||
void packData( BitStream* stream ) override;
|
||||
void unpackData( BitStream* stream ) override;
|
||||
bool preload( bool server, String& errorStr ) override;
|
||||
bool onAdd() override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
|
|||
|
|
@ -229,8 +229,8 @@ class SFXWorld : public ScopeTracker< NUM_DIMENSIONS, Object >
|
|||
F32 _getSortValue( Object object );
|
||||
|
||||
// ScopeTracker.
|
||||
virtual void _onScopeIn( Object object );
|
||||
virtual void _onScopeOut( Object object );
|
||||
void _onScopeIn( Object object ) override;
|
||||
void _onScopeOut( Object object ) override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue