mirror of
https://github.com/dhewm/dhewm3.git
synced 2025-03-20 17:51:02 +00:00
Fix -Woverloaded-virtual warnings
hides overloaded virtual function Fix member signatures of deriving classes to its super classes. Removes the unused idGameBustOutWindow::Activate() and the useless idMarkerWindow::GetWinVarByName().
This commit is contained in:
parent
2556a3923f
commit
50a48cdf6b
11 changed files with 5 additions and 31 deletions
|
@ -148,6 +148,6 @@ idDeclEntityDef::Print
|
|||
Dumps all key/value pairs, including inherited ones
|
||||
================
|
||||
*/
|
||||
void idDeclEntityDef::Print( void ) {
|
||||
void idDeclEntityDef::Print( void ) const {
|
||||
dict.Print();
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ public:
|
|||
virtual const char * DefaultDefinition() const;
|
||||
virtual bool Parse( const char *text, const int textLength );
|
||||
virtual void FreeData( void );
|
||||
virtual void Print( void );
|
||||
virtual void Print( void ) const;
|
||||
};
|
||||
|
||||
#endif /* !__DECLENTITYDEF_H__ */
|
||||
|
|
|
@ -2238,7 +2238,7 @@ void idRenderModelStatic::WriteToDemoFile( class idDemoFile *f ) {
|
|||
idRenderModelStatic::IsLoaded
|
||||
================
|
||||
*/
|
||||
bool idRenderModelStatic::IsLoaded( void ) {
|
||||
bool idRenderModelStatic::IsLoaded( void ) const {
|
||||
return !purged;
|
||||
}
|
||||
|
||||
|
|
|
@ -208,7 +208,7 @@ public:
|
|||
virtual void LoadModel() = 0;
|
||||
|
||||
// internal use
|
||||
virtual bool IsLoaded() = 0;
|
||||
virtual bool IsLoaded() const = 0;
|
||||
virtual void SetLevelLoadReferenced( bool referenced ) = 0;
|
||||
virtual bool IsLevelLoadReferenced() = 0;
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
virtual void PurgeModel();
|
||||
virtual void Reset() {};
|
||||
virtual void LoadModel();
|
||||
virtual bool IsLoaded();
|
||||
virtual bool IsLoaded() const;
|
||||
virtual void SetLevelLoadReferenced( bool referenced );
|
||||
virtual bool IsLevelLoadReferenced();
|
||||
virtual void TouchData();
|
||||
|
|
|
@ -536,15 +536,6 @@ void idGameBearShootWindow::Draw(int time, float x, float y) {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
=============================
|
||||
idGameBearShootWindow::Activate
|
||||
=============================
|
||||
*/
|
||||
const char *idGameBearShootWindow::Activate(bool activate) {
|
||||
return "";
|
||||
}
|
||||
|
||||
/*
|
||||
=============================
|
||||
idGameBearShootWindow::UpdateTurret
|
||||
|
|
|
@ -78,7 +78,6 @@ public:
|
|||
virtual const char* HandleEvent(const sysEvent_t *event, bool *updateVisuals);
|
||||
virtual void PostParse();
|
||||
virtual void Draw(int time, float x, float y);
|
||||
virtual const char* Activate(bool activate);
|
||||
virtual idWinVar * GetWinVarByName (const char *_name, bool winLookup = false, drawWin_t** owner = NULL);
|
||||
|
||||
private:
|
||||
|
|
|
@ -771,16 +771,6 @@ void idGameBustOutWindow::Draw(int time, float x, float y) {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
=============================
|
||||
idGameBustOutWindow::Activate
|
||||
=============================
|
||||
*/
|
||||
const char *idGameBustOutWindow::Activate(bool activate) {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=============================
|
||||
idGameBustOutWindow::UpdateScore
|
||||
|
|
|
@ -120,7 +120,6 @@ public:
|
|||
virtual const char* HandleEvent(const sysEvent_t *event, bool *updateVisuals);
|
||||
virtual void PostParse();
|
||||
virtual void Draw(int time, float x, float y);
|
||||
virtual const char* Activate(bool activate);
|
||||
virtual idWinVar * GetWinVarByName (const char *_name, bool winLookup = false, drawWin_t** owner = NULL);
|
||||
|
||||
idList<BOEntity*> entities;
|
||||
|
|
|
@ -84,10 +84,6 @@ bool idMarkerWindow::ParseInternalVar(const char *_name, idParser *src) {
|
|||
return idWindow::ParseInternalVar(_name, src);
|
||||
}
|
||||
|
||||
idWinVar *idMarkerWindow::GetWinVarByName(const char *_name, bool fixup) {
|
||||
return idWindow::GetWinVarByName(_name, fixup);
|
||||
}
|
||||
|
||||
const char *idMarkerWindow::HandleEvent(const sysEvent_t *event, bool *updateVisuals) {
|
||||
|
||||
if (!(event->evType == SE_KEY && event->evValue2)) {
|
||||
|
|
|
@ -42,7 +42,6 @@ public:
|
|||
idMarkerWindow(idDeviceContext *d, idUserInterfaceLocal *gui);
|
||||
virtual ~idMarkerWindow();
|
||||
virtual size_t Allocated(){return idWindow::Allocated();};
|
||||
virtual idWinVar *GetWinVarByName(const char *_name, bool winLookup = false);
|
||||
|
||||
virtual const char *HandleEvent(const sysEvent_t *event, bool *updateVisuals);
|
||||
virtual void PostParse();
|
||||
|
|
Loading…
Reference in a new issue