Skip to content

Commit

Permalink
Fix -Wsuggest-override warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Allofich committed Sep 7, 2024
1 parent 18a57df commit b41c5c7
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
58 changes: 29 additions & 29 deletions src/dos/cdrom.h
Original file line number Diff line number Diff line change
Expand Up @@ -438,26 +438,26 @@ class CDROM_Interface_Aspi : public CDROM_Interface
public:
virtual ~CDROM_Interface_Aspi(void);

bool SetDevice (char* path, int forceCD);
bool SetDevice (char* path, int forceCD) override;

bool GetUPC (unsigned char& attr, char* upc);
bool GetUPC (unsigned char& attr, char* upc) override;

bool GetAudioTracks (int& stTrack, int& end, TMSF& leadOut);
bool GetAudioTrackInfo (int track, TMSF& start, unsigned char& attr);
bool GetAudioSub (unsigned char& attr, unsigned char& track, unsigned char& index, TMSF& relPos, TMSF& absPos);
bool GetAudioStatus (bool& playing, bool& pause);
bool GetMediaTrayStatus (bool& mediaPresent, bool& mediaChanged, bool& trayOpen);
bool GetAudioTracks (int& stTrack, int& end, TMSF& leadOut) override;
bool GetAudioTrackInfo (int track, TMSF& start, unsigned char& attr) override;
bool GetAudioSub (unsigned char& attr, unsigned char& track, unsigned char& index, TMSF& relPos, TMSF& absPos) override;
bool GetAudioStatus (bool& playing, bool& pause) override;
bool GetMediaTrayStatus (bool& mediaPresent, bool& mediaChanged, bool& trayOpen) override;

bool PlayAudioSector (unsigned long start,unsigned long len);
bool PauseAudio (bool resume);
bool StopAudio (void);
void ChannelControl (TCtrl ctrl) { (void)ctrl; return; };
bool PlayAudioSector (unsigned long start,unsigned long len) override;
bool PauseAudio (bool resume) override;
bool StopAudio (void) override;
void ChannelControl (TCtrl ctrl) override { (void)ctrl; return; };

bool ReadSectors (PhysPt buffer, bool raw, unsigned long sector, unsigned long num);
bool ReadSectors (PhysPt buffer, bool raw, unsigned long sector, unsigned long num) override;
/* This is needed for IDE hack, who's buffer does not exist in DOS physical memory */
bool ReadSectorsHost (void* buffer, bool raw, unsigned long sector, unsigned long num);
bool ReadSectorsHost (void* buffer, bool raw, unsigned long sector, unsigned long num) override;

bool LoadUnloadMedia (bool unload);
bool LoadUnloadMedia (bool unload) override;

private:
DWORD GetTOC (LPTOC toc);
Expand Down Expand Up @@ -491,29 +491,29 @@ class CDROM_Interface_Ioctl : public CDROM_Interface
CDROM_Interface_Ioctl (cdioctl_cdatype ioctl_cda);
virtual ~CDROM_Interface_Ioctl(void);

bool SetDevice (char* path, int forceCD);
bool SetDevice (char* path, int forceCD) override;

bool GetUPC (unsigned char& attr, char* upc);
bool GetUPC (unsigned char& attr, char* upc) override;

bool GetAudioTracks (int& stTrack, int& end, TMSF& leadOut);
bool GetAudioTrackInfo (int track, TMSF& start, unsigned char& attr);
bool GetAudioSub (unsigned char& attr, unsigned char& track, unsigned char& index, TMSF& relPos, TMSF& absPos);
bool GetAudioStatus (bool& playing, bool& pause);
bool GetMediaTrayStatus (bool& mediaPresent, bool& mediaChanged, bool& trayOpen);
bool GetAudioTracks (int& stTrack, int& end, TMSF& leadOut) override;
bool GetAudioTrackInfo (int track, TMSF& start, unsigned char& attr) override;
bool GetAudioSub (unsigned char& attr, unsigned char& track, unsigned char& index, TMSF& relPos, TMSF& absPos) override;
bool GetAudioStatus (bool& playing, bool& pause) override;
bool GetMediaTrayStatus (bool& mediaPresent, bool& mediaChanged, bool& trayOpen) override;

bool PlayAudioSector (unsigned long start,unsigned long len);
bool PauseAudio (bool resume);
bool StopAudio (void);
void ChannelControl (TCtrl ctrl);
bool PlayAudioSector (unsigned long start,unsigned long len) override;
bool PauseAudio (bool resume) override;
bool StopAudio (void) override;
void ChannelControl (TCtrl ctrl) override;

bool ReadSector (uint8_t *buffer, bool raw, unsigned long sector);
bool ReadSectors (PhysPt buffer, bool raw, unsigned long sector, unsigned long num);
bool ReadSectors (PhysPt buffer, bool raw, unsigned long sector, unsigned long num) override;
/* This is needed for IDE hack, who's buffer does not exist in DOS physical memory */
bool ReadSectorsHost (void* buffer, bool raw, unsigned long sector, unsigned long num);
bool ReadSectorsHost (void* buffer, bool raw, unsigned long sector, unsigned long num) override;

bool LoadUnloadMedia (bool unload);
bool LoadUnloadMedia (bool unload) override;

void InitNewMedia (void) { Close(); Open(); };
void InitNewMedia (void) override { Close(); Open(); };
private:

bool Open (void);
Expand Down
4 changes: 2 additions & 2 deletions src/dos/dos_programs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3221,7 +3221,7 @@ static void LOADROM_ProgramStart(Program * * make) {
#if C_DEBUG
class BIOSTEST : public Program {
public:
void Run(void) {
void Run(void) override {
if (!(cmd->FindCommand(1, temp_line))) {
WriteOut("Must specify BIOS file to load.\n");
return;
Expand Down Expand Up @@ -7196,7 +7196,7 @@ void VFRCRATE_ProgramStart(Program * * make);
#if defined C_DEBUG
class NMITEST : public Program {
public:
void Run(void) {
void Run(void) override {
if (cmd->FindExist("-?", false) || cmd->FindExist("/?", false)) {
WriteOut("Generates a non-maskable interrupt (NMI).\n\nNMITEST\n\nNote: This is a debugging tool to test if the interrupt handler works properly.\n");
return;
Expand Down
2 changes: 1 addition & 1 deletion src/hardware/ipx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ class IPXNET : public Program {
}
}

void Run(void)
void Run(void) override
{
WriteOut("IPX Tunneling utility for DOSBox-X\n\n");
if(!cmd->GetCount()) {
Expand Down

0 comments on commit b41c5c7

Please sign in to comment.