Skip to content

Commit 0ad9501

Browse files
author
stgatilov
committed
Added "override" keyword where possible, and ensured "virtual" is also present.
I hope putting override will now become part od habit / code style =) See also: https://forums.thedarkmod.com/index.php?/topic/22309-virtual-methods-and-override-keyword/ git-svn-id: http://svn.thedarkmod.com/svn/darkmod_src/trunk@10602 49c82d7f-2e2a-0410-a16f-ae8f201b507f
1 parent 1bdf630 commit 0ad9501

File tree

209 files changed

+2664
-2714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+2664
-2714
lines changed

Diff for: ‎cm/CollisionModel_local.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -282,57 +282,57 @@ typedef struct cm_procNode_s {
282282
class idCollisionModelManagerLocal : public idCollisionModelManager {
283283
public:
284284
// load collision models from a map file
285-
void LoadMap( const idMapFile *mapFile );
285+
virtual void LoadMap( const idMapFile *mapFile ) override;
286286
// frees all the collision models
287-
void FreeMap( void );
287+
virtual void FreeMap( void ) override;
288288

289289
// get clip handle for model
290-
cmHandle_t LoadModel( const char *modelName, const bool precache, const idDeclSkin* skin = NULL ); // skin added #4232 SteveL
290+
virtual cmHandle_t LoadModel( const char *modelName, const bool precache, const idDeclSkin* skin = NULL ) override; // skin added #4232 SteveL
291291
// sets up a trace model for collision with other trace models
292-
cmHandle_t SetupTrmModel( const idTraceModel &trm, const idMaterial *material );
292+
virtual cmHandle_t SetupTrmModel( const idTraceModel &trm, const idMaterial *material ) override;
293293
// create trace model from a collision model, returns true if succesfull
294-
bool TrmFromModel( const char *modelName, idTraceModel &trm );
294+
virtual bool TrmFromModel( const char *modelName, idTraceModel &trm ) override;
295295

296296
// name of the model
297-
const char * GetModelName( cmHandle_t model ) const; // NB will include ~skin_name if model is skinned #4232 SteveL
297+
virtual const char *GetModelName( cmHandle_t model ) const override; // NB will include ~skin_name if model is skinned #4232 SteveL
298298
// bounds of the model
299-
bool GetModelBounds( cmHandle_t model, idBounds &bounds ) const;
299+
virtual bool GetModelBounds( cmHandle_t model, idBounds &bounds ) const override;
300300
// all contents flags of brushes and polygons ored together
301-
bool GetModelContents( cmHandle_t model, int &contents ) const;
301+
virtual bool GetModelContents( cmHandle_t model, int &contents ) const override;
302302
// get the vertex of a model
303-
bool GetModelVertex( cmHandle_t model, int vertexNum, idVec3 &vertex ) const;
303+
virtual bool GetModelVertex( cmHandle_t model, int vertexNum, idVec3 &vertex ) const override;
304304
// get the edge of a model
305-
bool GetModelEdge( cmHandle_t model, int edgeNum, idVec3 &start, idVec3 &end ) const;
305+
virtual bool GetModelEdge( cmHandle_t model, int edgeNum, idVec3 &start, idVec3 &end ) const override;
306306
// get the polygon of a model
307-
bool GetModelPolygon( cmHandle_t model, int polygonNum, idFixedWinding &winding ) const;
307+
virtual bool GetModelPolygon( cmHandle_t model, int polygonNum, idFixedWinding &winding ) const override;
308308

309309
// translates a trm and reports the first collision if any
310-
void Translation( trace_t *results, const idVec3 &start, const idVec3 &end,
310+
virtual void Translation( trace_t *results, const idVec3 &start, const idVec3 &end,
311311
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
312-
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis );
312+
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) override;
313313
// rotates a trm and reports the first collision if any
314-
void Rotation( trace_t *results, const idVec3 &start, const idRotation &rotation,
314+
virtual void Rotation( trace_t *results, const idVec3 &start, const idRotation &rotation,
315315
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
316-
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis );
316+
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) override;
317317
// returns the contents the trm is stuck in or 0 if the trm is in free space
318-
int Contents( const idVec3 &start,
318+
virtual int Contents( const idVec3 &start,
319319
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
320-
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis );
320+
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) override;
321321
// stores all contact points of the trm with the model, returns the number of contacts
322-
int Contacts( contactInfo_t *contacts, const int maxContacts, const idVec3 &start, const idVec6 &dir, const float depth,
322+
virtual int Contacts( contactInfo_t *contacts, const int maxContacts, const idVec3 &start, const idVec6 &dir, const float depth,
323323
const idTraceModel *trm, const idMat3 &trmAxis, int contentMask,
324-
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis );
324+
cmHandle_t model, const idVec3 &modelOrigin, const idMat3 &modelAxis ) override;
325325
// test collision detection
326-
void DebugOutput( const idVec3 &origin );
326+
virtual void DebugOutput( const idVec3 &origin ) override;
327327
// draw a model
328-
void DrawModel( cmHandle_t model, const idVec3 &origin, const idMat3 &axis,
329-
const idVec3 &viewOrigin, const float radius );
328+
virtual void DrawModel( cmHandle_t model, const idVec3 &origin, const idMat3 &axis,
329+
const idVec3 &viewOrigin, const float radius ) override;
330330
// print model information, use -1 handle for accumulated model info
331-
void ModelInfo( cmHandle_t model );
331+
virtual void ModelInfo( cmHandle_t model ) override;
332332
// list all loaded models
333-
void ListModels( void );
333+
virtual void ListModels( void ) override;
334334
// write a collision model file for the map entity
335-
bool WriteCollisionModelForMapEntity( const idMapEntity *mapEnt, const char *filename, const bool testTraceModel = true );
335+
virtual bool WriteCollisionModelForMapEntity( const idMapEntity *mapEnt, const char *filename, const bool testTraceModel = true ) override;
336336

337337
private: // CollisionMap_translate.cpp
338338
int TranslateEdgeThroughEdge( idVec3 &cross, idPluecker &l1, idPluecker &l2, float *fraction );

Diff for: ‎framework/CVarSystem.cpp

+30-30
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class idInternalCVar : public idCVar {
3434
idInternalCVar( void ) = default;
3535
idInternalCVar( const char *newName, const char *newValue, int newFlags );
3636
idInternalCVar( const idCVar *cvar );
37-
virtual ~idInternalCVar( void );
37+
virtual ~idInternalCVar( void ) override;
3838

3939
const char ** CopyValueStrings( const char **strings );
4040
void Update( const idCVar *cvar );
@@ -48,11 +48,11 @@ class idInternalCVar : public idCVar {
4848
idStr valueString; // value
4949
idStr descriptionString; // description
5050

51-
virtual void InternalSetString( const char *newValue );
51+
virtual void InternalSetString( const char *newValue ) override;
5252
virtual void InternalServerSetString( const char *newValue );
53-
virtual void InternalSetBool( const bool newValue );
54-
virtual void InternalSetInteger( const int newValue );
55-
virtual void InternalSetFloat( const float newValue );
53+
virtual void InternalSetBool( const bool newValue ) override;
54+
virtual void InternalSetInteger( const int newValue ) override;
55+
virtual void InternalSetFloat( const float newValue ) override;
5656
};
5757

5858
/*
@@ -361,41 +361,41 @@ class idCVarSystemLocal : public idCVarSystem {
361361
public:
362362
idCVarSystemLocal( void );
363363

364-
virtual ~idCVarSystemLocal( void ) {}
364+
virtual ~idCVarSystemLocal( void ) override {}
365365

366-
virtual void Init( void );
367-
virtual void Shutdown( void );
368-
virtual bool IsInitialized( void ) const;
366+
virtual void Init( void ) override;
367+
virtual void Shutdown( void ) override;
368+
virtual bool IsInitialized( void ) const override;
369369

370-
virtual void Register( idCVar *cvar );
370+
virtual void Register( idCVar *cvar ) override;
371371

372-
virtual idCVar * Find( const char *name );
372+
virtual idCVar * Find( const char *name ) override;
373373

374-
virtual void SetCVarString( const char *name, const char *value, int flags = 0 );
375-
virtual void SetCVarBool( const char *name, const bool value, int flags = 0 );
376-
virtual void SetCVarInteger( const char *name, const int value, int flags = 0 );
377-
virtual void SetCVarFloat( const char *name, const float value, int flags = 0 );
374+
virtual void SetCVarString( const char *name, const char *value, int flags = 0 ) override;
375+
virtual void SetCVarBool( const char *name, const bool value, int flags = 0 ) override;
376+
virtual void SetCVarInteger( const char *name, const int value, int flags = 0 ) override;
377+
virtual void SetCVarFloat( const char *name, const float value, int flags = 0 ) override;
378378

379-
virtual const char * GetCVarString( const char *name ) const;
380-
virtual bool GetCVarBool( const char *name ) const;
381-
virtual int GetCVarInteger( const char *name ) const;
382-
virtual float GetCVarFloat( const char *name ) const;
379+
virtual const char * GetCVarString( const char *name ) const override;
380+
virtual bool GetCVarBool( const char *name ) const override;
381+
virtual int GetCVarInteger( const char *name ) const override;
382+
virtual float GetCVarFloat( const char *name ) const override;
383383

384-
virtual bool Command( const idCmdArgs &args );
384+
virtual bool Command( const idCmdArgs &args ) override;
385385

386-
virtual void CommandCompletion( void(*callback)( const char *s ) );
387-
virtual void ArgCompletion( const char *cmdString, void(*callback)( const char *s ) );
386+
virtual void CommandCompletion( void(*callback)( const char *s ) ) override;
387+
virtual void ArgCompletion( const char *cmdString, void(*callback)( const char *s ) ) override;
388388

389-
virtual void SetModifiedFlags( int flags );
390-
virtual int GetModifiedFlags( void ) const;
391-
virtual void ClearModifiedFlags( int flags );
389+
virtual void SetModifiedFlags( int flags ) override;
390+
virtual int GetModifiedFlags( void ) const override;
391+
virtual void ClearModifiedFlags( int flags ) override;
392392

393-
virtual void ResetFlaggedVariables( int flags );
394-
virtual void RemoveFlaggedAutoCompletion( int flags );
395-
virtual void WriteFlaggedVariables( int flags, const char *setCmd, idFile *f ) const;
393+
virtual void ResetFlaggedVariables( int flags ) override;
394+
virtual void RemoveFlaggedAutoCompletion( int flags ) override;
395+
virtual void WriteFlaggedVariables( int flags, const char *setCmd, idFile *f ) const override;
396396

397-
virtual const idDict * MoveCVarsToDict( int flags ) const;
398-
virtual void SetCVarsFromDict( const idDict &dict );
397+
virtual const idDict * MoveCVarsToDict( int flags ) const override;
398+
virtual void SetCVarsFromDict( const idDict &dict ) override;
399399

400400
void RegisterInternal( idCVar *cvar );
401401
idInternalCVar * FindInternal( const char *name ) const;

Diff for: ‎framework/CmdSystem.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,28 @@ typedef struct commandDef_s {
3838

3939
class idCmdSystemLocal : public idCmdSystem {
4040
public:
41-
virtual void Init( void );
42-
virtual void Shutdown( void );
41+
virtual void Init( void ) override;
42+
virtual void Shutdown( void ) override;
4343

44-
virtual void AddCommand( const char *cmdName, cmdFunction_t function, int flags, const char *description, argCompletion_t argCompletion = NULL );
45-
virtual void RemoveCommand( const char *cmdName );
46-
virtual void RemoveFlaggedCommands( int flags );
44+
virtual void AddCommand( const char *cmdName, cmdFunction_t function, int flags, const char *description, argCompletion_t argCompletion = NULL ) override;
45+
virtual void RemoveCommand( const char *cmdName ) override;
46+
virtual void RemoveFlaggedCommands( int flags ) override;
4747

48-
virtual void CommandCompletion( void(*callback)( const char *s ) );
49-
virtual void ArgCompletion( const char *cmdString, void(*callback)( const char *s ) );
50-
virtual void ExecuteCommandText( const char* text );
51-
virtual void AppendCommandText( const char* text );
48+
virtual void CommandCompletion( void(*callback)( const char *s ) ) override;
49+
virtual void ArgCompletion( const char *cmdString, void(*callback)( const char *s ) ) override;
50+
void ExecuteCommandText( const char* text );
51+
virtual void AppendCommandText( const char* text ) override;
5252

53-
virtual void BufferCommandText( cmdExecution_t exec, const char *text );
54-
virtual void ExecuteCommandBuffer( void );
53+
virtual void BufferCommandText( cmdExecution_t exec, const char *text ) override;
54+
virtual void ExecuteCommandBuffer( void ) override;
5555

56-
virtual void ArgCompletion_FolderExtension( const idCmdArgs &args, void(*callback)( const char *s ), const char *folder, bool stripFolder, ... );
57-
virtual void ArgCompletion_DeclName( const idCmdArgs &args, void(*callback)( const char *s ), int type );
56+
virtual void ArgCompletion_FolderExtension( const idCmdArgs &args, void(*callback)( const char *s ), const char *folder, bool stripFolder, ... ) override;
57+
virtual void ArgCompletion_DeclName( const idCmdArgs &args, void(*callback)( const char *s ), int type ) override;
5858

59-
virtual void BufferCommandArgs( cmdExecution_t exec, const idCmdArgs &args );
59+
virtual void BufferCommandArgs( cmdExecution_t exec, const idCmdArgs &args ) override;
6060

61-
virtual void SetupReloadEngine( const idCmdArgs &args );
62-
virtual bool PostReloadEngine( void );
61+
virtual void SetupReloadEngine( const idCmdArgs &args ) override;
62+
virtual bool PostReloadEngine( void ) override;
6363

6464
void SetWait( int numFrames ) { wait = numFrames; }
6565
commandDef_t * GetCommands( void ) const { return commands; }

Diff for: ‎framework/Common.cpp

+41-41
Original file line numberDiff line numberDiff line change
@@ -158,49 +158,49 @@ class idCommonLocal : public idCommon {
158158
public:
159159
idCommonLocal( void );
160160

161-
virtual void Init( int argc, const char **argv, const char *cmdline );
162-
virtual void Shutdown( void );
163-
virtual void Quit( void );
164-
virtual bool IsInitialized( void ) const;
165-
virtual void Frame( void );
166-
virtual void GUIFrame( bool execCmd, bool network );
167-
virtual void Async( void );
168-
virtual void StartupVariable( const char *match, bool once );
169-
virtual void InitTool( const toolFlag_t tool, const idDict *dict );
170-
virtual void ActivateTool( bool active );
171-
virtual void WriteConfigToFile( const char *filename, const char* basePath = "fs_savepath", const eConfigExport configexport = eConfigExport_all);
172-
virtual void WriteFlaggedCVarsToFile( const char *filename, int flags, const char *setCmd );
173-
virtual void BeginRedirect( char *buffer, int buffersize, void (*flush)( const char * ) );
174-
virtual void EndRedirect( void );
175-
virtual void SetRefreshOnPrint( bool set );
176-
virtual void Printf( const char *fmt, ... ) id_attribute((format(printf,2,3)));
177-
virtual void VPrintf( const char *fmt, va_list arg );
178-
virtual void DPrintf( const char *fmt, ... ) id_attribute((format(printf,2,3)));
179-
virtual void PrintCallStack();
180-
virtual void Warning( const char *fmt, ... ) id_attribute((format(printf,2,3)));
181-
virtual void DWarning( const char *fmt, ...) id_attribute((format(printf,2,3)));
182-
virtual void PrintWarnings( void );
183-
virtual void ClearWarnings( const char *reason );
184-
virtual void PacifierUpdate( loadkey_t key, int count ); // grayman #3763
185-
virtual void Error( const char *fmt, ... ) id_attribute((format(printf,2,3)));
186-
virtual void DoError( const char *msg, int code );
187-
virtual void FatalError( const char *fmt, ... ) id_attribute( ( format( printf, 2, 3 ) ) );
188-
virtual void DoFatalError( const char *msg, int code );
189-
virtual void SetErrorIndirection( bool enable );
190-
virtual const char* Translate( const char* str );
191-
virtual bool WindowAvailable(void); // Agent Jones #3766
192-
193-
virtual I18N* GetI18N();
194-
195-
virtual const char * KeysFromBinding( const char *bind );
196-
virtual const char * BindingFromKey( const char *key );
197-
198-
virtual int ButtonState( int key );
199-
virtual int KeyState( int key );
161+
virtual void Init( int argc, const char **argv, const char *cmdline ) override;
162+
virtual void Shutdown( void ) override;
163+
virtual void Quit( void ) override;
164+
virtual bool IsInitialized( void ) const override;
165+
virtual void Frame( void ) override;
166+
virtual void GUIFrame( bool execCmd, bool network ) override;
167+
virtual void Async( void ) override;
168+
virtual void StartupVariable( const char *match, bool once ) override;
169+
virtual void InitTool( const toolFlag_t tool, const idDict *dict ) override;
170+
virtual void ActivateTool( bool active ) override;
171+
virtual void WriteConfigToFile( const char *filename, const char* basePath = "fs_savepath", const eConfigExport configexport = eConfigExport_all) override;
172+
virtual void WriteFlaggedCVarsToFile( const char *filename, int flags, const char *setCmd ) override;
173+
virtual void BeginRedirect( char *buffer, int buffersize, void (*flush)( const char * ) ) override;
174+
virtual void EndRedirect( void ) override;
175+
virtual void SetRefreshOnPrint( bool set ) override;
176+
virtual void Printf( const char *fmt, ... ) override id_attribute((format(printf,2,3)));
177+
virtual void VPrintf( const char *fmt, va_list arg ) override;
178+
virtual void DPrintf( const char *fmt, ... ) override id_attribute((format(printf,2,3)));
179+
virtual void PrintCallStack() override;
180+
virtual void Warning( const char *fmt, ... ) override id_attribute((format(printf,2,3)));
181+
virtual void DWarning( const char *fmt, ...) override id_attribute((format(printf,2,3)));
182+
virtual void PrintWarnings( void ) override;
183+
virtual void ClearWarnings( const char *reason ) override;
184+
virtual void PacifierUpdate( loadkey_t key, int count ) override; // grayman #3763
185+
virtual void Error( const char *fmt, ... ) override id_attribute((format(printf,2,3)));
186+
virtual void DoError( const char *msg, int code ) override;
187+
virtual void FatalError( const char *fmt, ... ) override id_attribute( ( format( printf, 2, 3 ) ) );
188+
virtual void DoFatalError( const char *msg, int code ) override;
189+
virtual void SetErrorIndirection( bool enable ) override;
190+
virtual const char* Translate( const char* str ) override;
191+
virtual bool WindowAvailable(void) override; // Agent Jones #3766
192+
193+
virtual I18N* GetI18N() override;
194+
195+
virtual const char * KeysFromBinding( const char *bind ) override;
196+
virtual const char * BindingFromKey( const char *key ) override;
197+
198+
virtual int ButtonState( int key ) override;
199+
virtual int KeyState( int key ) override;
200200

201201
//stgatilov: for automation
202-
virtual int GetConsoleMarker();
203-
virtual idStr GetConsoleContents(int begin, int end);
202+
virtual int GetConsoleMarker() override;
203+
virtual idStr GetConsoleContents(int begin, int end) override;
204204

205205
void InitGame( void );
206206
void ShutdownGame( bool reloading );

0 commit comments

Comments
 (0)