ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings from Clang 11. 

Apparently d'tors in child classes should now be marked override rather than virtual (to match other methods).
So we do that specifically now.
This commit is contained in:
Stephen Anthony 2020-08-17 10:38:43 -02:30
parent cc1af55a6b
commit bc8b34e923
232 changed files with 287 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cheat/BankRomCheat.hxx
View File

@ -24,7 +24,7 @@ class BankRomCheat : public Cheat
{
public:
BankRomCheat(OSystem& os, const string& name, const string& code);
virtual ~BankRomCheat() = default;
~BankRomCheat() override = default;
bool enable() override;
bool disable() override;

2
src/cheat/CheatCodeDialog.hxx
View File

@ -36,7 +36,7 @@ class CheatCodeDialog : public Dialog
public:
CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font);
virtual ~CheatCodeDialog();
~CheatCodeDialog() override;
protected:
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

2
src/cheat/CheetahCheat.hxx
View File

@ -24,7 +24,7 @@ class CheetahCheat : public Cheat
{
public:
CheetahCheat(OSystem& os, const string& name, const string& code);
virtual ~CheetahCheat() = default;
~CheetahCheat() override = default;
bool enable() override;
bool disable() override;

2
src/cheat/RamCheat.hxx
View File

@ -24,7 +24,7 @@ class RamCheat : public Cheat
{
public:
RamCheat(OSystem& os, const string& name, const string& code);
virtual ~RamCheat() = default;
~RamCheat() override = default;
bool enable() override;
bool disable() override;

1
src/common/EventHandlerSDL2.cxx
View File

@ -220,7 +220,6 @@ void EventHandlerSDL2::pollEvent()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventHandlerSDL2::JoystickSDL2::JoystickSDL2(int idx)
: myStick(nullptr)
{
ASSERT_MAIN_THREAD;

4
src/common/EventHandlerSDL2.hxx
View File

@ -36,7 +36,7 @@ class EventHandlerSDL2 : public EventHandler
Create a new SDL2 event handler object
*/
explicit EventHandlerSDL2(OSystem& osystem);
virtual ~EventHandlerSDL2();
~EventHandlerSDL2() override;
private:
/**
@ -61,7 +61,7 @@ class EventHandlerSDL2 : public EventHandler
virtual ~JoystickSDL2();
private:
SDL_Joystick* myStick;
SDL_Joystick* myStick{nullptr};
};
private:

2
src/common/FBSurfaceSDL2.hxx
View File

@ -35,7 +35,7 @@ class FBSurfaceSDL2 : public FBSurface
FBSurfaceSDL2(FrameBufferSDL2& buffer, uInt32 width, uInt32 height,
FrameBuffer::ScalingInterpolation interpolation,
const uInt32* staticData);
virtual ~FBSurfaceSDL2();
~FBSurfaceSDL2() override;
// Most of the surface drawing primitives are implemented in FBSurface;
// the ones implemented here use SDL-specific code for extra performance

2
src/common/FrameBufferSDL2.hxx
View File

@ -39,7 +39,7 @@ class FrameBufferSDL2 : public FrameBuffer
Creates a new SDL2 framebuffer
*/
explicit FrameBufferSDL2(OSystem& osystem);
virtual ~FrameBufferSDL2();
~FrameBufferSDL2() override;
//////////////////////////////////////////////////////////////////////
// The following are derived from public methods in FrameBuffer.hxx

1
src/common/PaletteHandler.hxx
View File

@ -54,7 +54,6 @@ class PaletteHandler
public:
PaletteHandler(OSystem& system);
virtual ~PaletteHandler() = default;
/**
Cycle through available palettes.

6
src/common/SoundNull.hxx
View File

@ -43,11 +43,7 @@ class SoundNull : public Sound
{
Logger::info("Sound disabled.\n");
}
/**
Destructor
*/
virtual ~SoundNull() = default;
~SoundNull() override = default;
public:
/**

2
src/common/SoundSDL2.hxx
View File

@ -48,7 +48,7 @@ class SoundSDL2 : public Sound
/**
Destructor
*/
virtual ~SoundSDL2();
~SoundSDL2() override;
public:
/**

2
src/common/sdl_blitter/BilinearBlitter.hxx
View File

@ -29,7 +29,7 @@ class BilinearBlitter : public Blitter {
BilinearBlitter(FrameBufferSDL2& fb, bool interpolate);
virtual ~BilinearBlitter();
~BilinearBlitter() override;
virtual void reinitialize(
SDL_Rect srcRect,

2
src/common/sdl_blitter/QisBlitter.hxx
View File

@ -31,7 +31,7 @@ class QisBlitter : public Blitter {
static bool isSupported(FrameBufferSDL2 &fb);
virtual ~QisBlitter();
~QisBlitter() override;
virtual void reinitialize(
SDL_Rect srcRect,

2
src/debugger/CartDebug.hxx
View File

@ -70,7 +70,7 @@ class CartDebug : public DebuggerSystem
public:
CartDebug(Debugger& dbg, Console& console, const OSystem& osystem);
virtual ~CartDebug() = default;
~CartDebug() override = default;
const DebuggerState& getState() override;
const DebuggerState& getOldState() override { return myOldState; }

2
src/debugger/Debugger.hxx
View File

@ -73,7 +73,7 @@ class Debugger : public DialogContainer
Create a new debugger parent object
*/
Debugger(OSystem& osystem, Console& console);
virtual ~Debugger();
~Debugger() override;
private:
static const Int8 ANY_BANK = -1;

2
src/debugger/DebuggerSystem.hxx
View File

@ -31,7 +31,7 @@ class DebuggerState
{
public:
DebuggerState() = default;
~DebuggerState() = default;
virtual ~DebuggerState() = default;
DebuggerState(const DebuggerState&) = default;
DebuggerState(DebuggerState&&) = delete;

2
src/debugger/gui/AmigaMouseWidget.hxx
View File

@ -28,7 +28,7 @@ class AmigaMouseWidget : public PointingDeviceWidget
AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~AmigaMouseWidget() = default;
~AmigaMouseWidget() override = default;
private:
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b11, 0b01 };

3
src/debugger/gui/AtariMouseWidget.hxx
View File

@ -27,8 +27,7 @@ class AtariMouseWidget : public PointingDeviceWidget
public:
AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~AtariMouseWidget() = default;
~AtariMouseWidget() override = default;
private:
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b01, 0b11, 0b10 };

2
src/debugger/gui/AtariVoxWidget.hxx
View File

@ -27,7 +27,7 @@ class AtariVoxWidget : public FlashWidget
public:
AtariVoxWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~AtariVoxWidget() = default;
~AtariVoxWidget() override = default;
private:
void eraseCurrent() override;

2
src/debugger/gui/AudioWidget.hxx
View File

@ -29,7 +29,7 @@ class AudioWidget : public Widget, public CommandSender
public:
AudioWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~AudioWidget() = default;
~AudioWidget() override = default;
private:
// ID's for the various widgets

2
src/debugger/gui/BoosterWidget.hxx
View File

@ -26,7 +26,7 @@ class BoosterWidget : public ControllerWidget
public:
BoosterWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~BoosterWidget() = default;
~BoosterWidget() override = default;
private:
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire, kJBooster, kJTrigger };

2
src/debugger/gui/Cart0840Widget.hxx
View File

@ -29,7 +29,7 @@ class Cartridge0840Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge0840& cart);
virtual ~Cartridge0840Widget() = default;
~Cartridge0840Widget() override = default;
private:
string manufacturer() override { return "Fred X. Quimby"; }

2
src/debugger/gui/Cart2KWidget.hxx
View File

@ -29,7 +29,7 @@ class Cartridge2KWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge2K& cart);
virtual ~Cartridge2KWidget() = default;
~Cartridge2KWidget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/Cart3EPlusWidget.hxx
View File

@ -32,7 +32,7 @@ class Cartridge3EPlusWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge3EPlus& cart);
virtual ~Cartridge3EPlusWidget() = default;
~Cartridge3EPlusWidget() override = default;
private:
string manufacturer() override { return "Thomas Jentzsch"; }

2
src/debugger/gui/Cart3EWidget.hxx
View File

@ -31,7 +31,7 @@ class Cartridge3EWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge3E& cart);
virtual ~Cartridge3EWidget() = default;
~Cartridge3EWidget() override = default;
private:
enum {

2
src/debugger/gui/Cart3FWidget.hxx
View File

@ -29,7 +29,7 @@ class Cartridge3FWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge3F& cart);
virtual ~Cartridge3FWidget() = default;
~Cartridge3FWidget() override = default;
private:
string manufacturer() override { return "TigerVision"; }

2
src/debugger/gui/Cart4A50Widget.hxx
View File

@ -30,7 +30,7 @@ class Cartridge4A50Widget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge4A50& cart);
virtual ~Cartridge4A50Widget() = default;
~Cartridge4A50Widget() override = default;
private:
Cartridge4A50& myCart;

2
src/debugger/gui/Cart4KSCWidget.hxx
View File

@ -29,7 +29,7 @@ class Cartridge4KSCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge4KSC& cart);
virtual ~Cartridge4KSCWidget() = default;
~Cartridge4KSCWidget() override = default;
private:
string manufacturer() override { return "homebrew intermediate format"; }

2
src/debugger/gui/Cart4KWidget.hxx
View File

@ -29,7 +29,7 @@ class Cartridge4KWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
Cartridge4K& cart);
virtual ~Cartridge4KWidget() = default;
~Cartridge4KWidget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartARWidget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeARWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeAR& cart);
virtual ~CartridgeARWidget() = default;
~CartridgeARWidget() override = default;
private:
CartridgeAR& myCart;

2
src/debugger/gui/CartBFSCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeBFSCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeBFSC& cart);
virtual ~CartridgeBFSCWidget() = default;
~CartridgeBFSCWidget() override = default;
private:
string manufacturer() override { return "CPUWIZ"; }

2
src/debugger/gui/CartBFWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeBFWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeBF& cart);
virtual ~CartridgeBFWidget() = default;
~CartridgeBFWidget() override = default;
private:
string manufacturer() override { return "CPUWIZ"; }

2
src/debugger/gui/CartBUSWidget.hxx
View File

@ -32,7 +32,7 @@ class CartridgeBUSWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeBUS& cart);
virtual ~CartridgeBUSWidget() = default;
~CartridgeBUSWidget() override = default;
private:
struct CartState {

2
src/debugger/gui/CartCDFInfoWidget.hxx
View File

@ -28,7 +28,7 @@ class CartridgeCDFInfoWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeCDF& cart);
virtual ~CartridgeCDFInfoWidget() = default;
~CartridgeCDFInfoWidget() override = default;
private:
static string describeCDFVersion(CartridgeCDF::CDFSubtype subtype);

2
src/debugger/gui/CartCDFWidget.hxx
View File

@ -33,7 +33,7 @@ class CartridgeCDFWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeCDF& cart);
virtual ~CartridgeCDFWidget() = default;
~CartridgeCDFWidget() override = default;
private:
struct CartState {

2
src/debugger/gui/CartCMWidget.hxx
View File

@ -34,7 +34,7 @@ class CartridgeCMWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeCM& cart);
virtual ~CartridgeCMWidget() = default;
~CartridgeCMWidget() override = default;
private:
struct CartState {

2
src/debugger/gui/CartCTYWidget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeCTYWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeCTY& cart);
virtual ~CartridgeCTYWidget() = default;
~CartridgeCTYWidget() override = default;
private:
CartridgeCTY& myCart;

2
src/debugger/gui/CartCVWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeCVWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeCV& cart);
virtual ~CartridgeCVWidget() = default;
~CartridgeCVWidget() override = default;
private:
string manufacturer() override { return "CommaVid"; }

2
src/debugger/gui/CartDFSCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeDFSCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeDFSC& cart);
virtual ~CartridgeDFSCWidget() = default;
~CartridgeDFSCWidget() override = default;
private:
string manufacturer() override { return "CPUWIZ"; }

2
src/debugger/gui/CartDFWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeDFWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeDF& cart);
virtual ~CartridgeDFWidget() = default;
~CartridgeDFWidget() override = default;
private:
string manufacturer() override { return "CPUWIZ"; }

2
src/debugger/gui/CartDPCPlusWidget.hxx
View File

@ -32,7 +32,7 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeDPCPlus& cart);
virtual ~CartridgeDPCPlusWidget() = default;
~CartridgeDPCPlusWidget() override = default;
private:
struct CartState {

2
src/debugger/gui/CartDPCWidget.hxx
View File

@ -31,7 +31,7 @@ class CartridgeDPCWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeDPC& cart);
virtual ~CartridgeDPCWidget() = default;
~CartridgeDPCWidget() override = default;
private:
struct CartState {

2
src/debugger/gui/CartDebugWidget.hxx
View File

@ -35,7 +35,7 @@ class CartDebugWidget : public Widget, public CommandSender
CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~CartDebugWidget() = default;
~CartDebugWidget() override = default;
public:
int addBaseInformation(size_t bytes, const string& manufacturer,

2
src/debugger/gui/CartE0Widget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeE0Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeE0& cart);
virtual ~CartridgeE0Widget() = default;
~CartridgeE0Widget() override = default;
private:
string manufacturer() override { return "Parker Brothers"; }

2
src/debugger/gui/CartE78KWidget.hxx
View File

@ -27,7 +27,7 @@ class CartridgeE78KWidget : public CartridgeMNetworkWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeMNetwork& cart);
virtual ~CartridgeE78KWidget() = default;
~CartridgeE78KWidget() override = default;
protected:
const char* getSpotLower(int idx) override;

2
src/debugger/gui/CartE7Widget.hxx
View File

@ -27,7 +27,7 @@ class CartridgeE7Widget : public CartridgeMNetworkWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeMNetwork& cart);
virtual ~CartridgeE7Widget() = default;
~CartridgeE7Widget() override = default;
protected:
const char* getSpotLower(int idx) override;

2
src/debugger/gui/CartEFSCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeEFSCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEFSC& cart);
virtual ~CartridgeEFSCWidget() = default;
~CartridgeEFSCWidget() override = default;
private:
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }

2
src/debugger/gui/CartEFWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeEFWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEF& cart);
virtual ~CartridgeEFWidget() = default;
~CartridgeEFWidget() override = default;
private:
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }

2
src/debugger/gui/CartEnhancedWidget.hxx
View File

@ -35,7 +35,7 @@ class CartridgeEnhancedWidget : public CartDebugWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEnhanced& cart);
virtual ~CartridgeEnhancedWidget() = default;
~CartridgeEnhancedWidget() override = default;
protected:
int initialize();

2
src/debugger/gui/CartF0Widget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF0Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF0& cart);
virtual ~CartridgeF0Widget() = default;
~CartridgeF0Widget() override = default;
private:
string manufacturer() override { return "Dynacom Megaboy"; }

2
src/debugger/gui/CartF4SCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF4SCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF4SC& cart);
virtual ~CartridgeF4SCWidget() = default;
~CartridgeF4SCWidget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartF4Widget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF4Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF4& cart);
virtual ~CartridgeF4Widget() = default;
~CartridgeF4Widget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartF6SCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF6SCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF6SC& cart);
virtual ~CartridgeF6SCWidget() = default;
~CartridgeF6SCWidget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartF6Widget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF6Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF6& cart);
virtual ~CartridgeF6Widget() = default;
~CartridgeF6Widget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartF8SCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeF8SCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF8SC& cart);
virtual ~CartridgeF8SCWidget() = default;
~CartridgeF8SCWidget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartF8Widget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeF8Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeF8& cart);
virtual ~CartridgeF8Widget() = default;
~CartridgeF8Widget() override = default;
private:
string manufacturer() override { return "Atari"; }

2
src/debugger/gui/CartFA2Widget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeFA2Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeFA2& cart);
virtual ~CartridgeFA2Widget() = default;
~CartridgeFA2Widget() override = default;
private:
CartridgeFA2& myCartFA2;

2
src/debugger/gui/CartFAWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeFAWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeFA& cart);
virtual ~CartridgeFAWidget() = default;
~CartridgeFAWidget() override = default;
private:
string manufacturer() override { return "CBS"; }

2
src/debugger/gui/CartFCWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeFCWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeFC& cart);
virtual ~CartridgeFCWidget() = default;
~CartridgeFCWidget() override = default;
private:
string manufacturer() override { return "Amiga Corp."; }

2
src/debugger/gui/CartFEWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeFEWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeFE& cart);
virtual ~CartridgeFEWidget() = default;
~CartridgeFEWidget() override = default;
private:
string manufacturer() override { return "Activision"; }

2
src/debugger/gui/CartMDMWidget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeMDMWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeMDM& cart);
virtual ~CartridgeMDMWidget() = default;
~CartridgeMDMWidget() override = default;
private:
string manufacturer() override { return "Edwin Blink"; }

2
src/debugger/gui/CartMNetworkWidget.hxx
View File

@ -31,7 +31,7 @@ class CartridgeMNetworkWidget : public CartDebugWidget
int x, int y, int w, int h,
//CartridgeE7& cart);
CartridgeMNetwork& cart);
virtual ~CartridgeMNetworkWidget() = default;
~CartridgeMNetworkWidget() override = default;
protected:
//CartridgeE7& myCart;

4
src/debugger/gui/CartRamWidget.hxx
View File

@ -34,7 +34,7 @@ class CartRamWidget : public Widget, public CommandSender
CartRamWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h, CartDebugWidget& cartDebug);
virtual ~CartRamWidget() = default;
~CartRamWidget() override = default;
void loadConfig() override;
void setOpsWidget(DataGridOpsWidget* w);
@ -66,7 +66,7 @@ class CartRamWidget : public Widget, public CommandSender
const GUI::Font& nfont,
int x, int y, int w, int h,
CartDebugWidget& cartDebug);
virtual ~InternalRamWidget() = default;
~InternalRamWidget() override = default;
private:
uInt8 getValue(int addr) const override;

2
src/debugger/gui/CartSBWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeSBWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeSB& cart);
virtual ~CartridgeSBWidget() = default;
~CartridgeSBWidget() override = default;
private:
string manufacturer() override { return "Fred X. Quimby"; }

2
src/debugger/gui/CartTVBoyWidget.hxx
View File

@ -30,7 +30,7 @@ class CartridgeTVBoyWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeTVBoy& cart);
virtual ~CartridgeTVBoyWidget() = default;
~CartridgeTVBoyWidget() override = default;
private:
string manufacturer() override { return "Akor"; }

2
src/debugger/gui/CartUAWidget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeUAWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeUA& cart, bool swapHotspots);
virtual ~CartridgeUAWidget() = default;
~CartridgeUAWidget() override = default;
private:
string manufacturer() override { return "UA Limited"; }

4
src/debugger/gui/CartWDWidget.hxx
View File

@ -29,9 +29,9 @@ class CartridgeWDWidget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeWD& cart);
virtual ~CartridgeWDWidget() = default;
~CartridgeWDWidget() override = default;
private:
private:
CartridgeWD& myCartWD;
private:

2
src/debugger/gui/CartX07Widget.hxx
View File

@ -29,7 +29,7 @@ class CartridgeX07Widget : public CartridgeEnhancedWidget
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeX07& cart);
virtual ~CartridgeX07Widget() = default;
~CartridgeX07Widget() override = default;
private:
string manufacturer() override { return "AtariAge / John Payson / Fred Quimby"; }

2
src/debugger/gui/ControllerWidget.hxx
View File

@ -40,7 +40,7 @@ class ControllerWidget : public Widget, public CommandSender, public ControllerL
_w = 18 * font.getMaxCharWidth();
_h = 8 * font.getLineHeight();
}
virtual ~ControllerWidget() = default;
~ControllerWidget() override = default;
virtual void loadConfig() override { }

2
src/debugger/gui/CpuWidget.hxx
View File

@ -33,7 +33,7 @@ class CpuWidget : public Widget, public CommandSender
public:
CpuWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int max_w);
virtual ~CpuWidget() = default;
~CpuWidget() override = default;
void setOpsWidget(DataGridOpsWidget* w);
void loadConfig() override;

2
src/debugger/gui/DataGridOpsWidget.hxx
View File

@ -36,7 +36,7 @@ class DataGridOpsWidget : public Widget, public CommandSender
{
public:
DataGridOpsWidget(GuiObject* boss, const GUI::Font& font, int x, int y);
virtual ~DataGridOpsWidget() = default;
~DataGridOpsWidget() override = default;
void setTarget(CommandReceiver* target);
void setEnabled(bool e);

2
src/debugger/gui/DataGridWidget.hxx
View File

@ -45,7 +45,7 @@ class DataGridWidget : public EditableWidget
int colchars, int bits,
Common::Base::Fmt format = Common::Base::Fmt::_DEFAULT,
bool useScrollbar = false);
virtual ~DataGridWidget() = default;
~DataGridWidget() override = default;
void setList(const IntArray& alist, const IntArray& vlist,
const BoolArray& changed);

2
src/debugger/gui/DebuggerDialog.hxx
View File

@ -57,7 +57,7 @@ class DebuggerDialog : public Dialog
DebuggerDialog(OSystem& osystem, DialogContainer& parent,
int x, int y, int w, int h);
virtual ~DebuggerDialog();
~DebuggerDialog() override;
const GUI::Font& lfont() const { return *myLFont; }
const GUI::Font& nfont() const { return *myNFont; }

2
src/debugger/gui/DelayQueueWidget.hxx
View File

@ -28,7 +28,7 @@ class DelayQueueWidget : public Widget
const GUI::Font& font,
int x, int y
);
virtual ~DelayQueueWidget() = default;
~DelayQueueWidget() override = default;
void loadConfig() override;

2
src/debugger/gui/DrivingWidget.hxx
View File

@ -30,7 +30,7 @@ class DrivingWidget : public ControllerWidget
public:
DrivingWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~DrivingWidget() = default;
~DrivingWidget() override = default;
private:
enum {

2
src/debugger/gui/FlashWidget.hxx
View File

@ -28,7 +28,7 @@ class FlashWidget : public ControllerWidget
public:
FlashWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~FlashWidget() = default;
~FlashWidget() override = default;
protected:
void init(GuiObject* boss, const GUI::Font& font, int x, int y);

2
src/debugger/gui/GenesisWidget.hxx
View File

@ -26,7 +26,7 @@ class GenesisWidget : public ControllerWidget
public:
GenesisWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~GenesisWidget() = default;
~GenesisWidget() override = default;
private:
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJBbtn, kJCbtn };

2
src/debugger/gui/JoystickWidget.hxx
View File

@ -26,7 +26,7 @@ class JoystickWidget : public ControllerWidget
public:
JoystickWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~JoystickWidget() = default;
~JoystickWidget() override = default;
private:
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire };

2
src/debugger/gui/KeyboardWidget.hxx
View File

@ -26,7 +26,7 @@ class KeyboardWidget : public ControllerWidget
public:
KeyboardWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~KeyboardWidget() = default;
~KeyboardWidget() override = default;
private:
std::array<CheckboxWidget*, 12> myBox{nullptr};

2
src/debugger/gui/NullControlWidget.hxx
View File

@ -44,7 +44,7 @@ class NullControlWidget : public ControllerWidget
TextAlign::Center);
}
virtual ~NullControlWidget() = default;
~NullControlWidget() override = default;
private:
// Following constructors and assignment operators not supported

2
src/debugger/gui/PaddleWidget.hxx
View File

@ -27,7 +27,7 @@ class PaddleWidget : public ControllerWidget
public:
PaddleWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~PaddleWidget() = default;
~PaddleWidget() override = default;
private:
enum { kP0Changed = 'P0ch', kP1Changed = 'P1ch',

3
src/debugger/gui/PointingDeviceWidget.hxx
View File

@ -28,8 +28,7 @@ class PointingDeviceWidget : public ControllerWidget
public:
PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~PointingDeviceWidget() = default;
~PointingDeviceWidget() override = default;
private:
enum {

2
src/debugger/gui/PromptWidget.hxx
View File

@ -39,7 +39,7 @@ class PromptWidget : public Widget, public CommandSender
public:
PromptWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int w, int h);
virtual ~PromptWidget() = default;
~PromptWidget() override = default;
public:
ATTRIBUTE_FMT_PRINTF int printf(const char* format, ...);

2
src/debugger/gui/RamWidget.hxx
View File

@ -35,7 +35,7 @@ class RamWidget : public Widget, public CommandSender
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h,
uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
virtual ~RamWidget();
~RamWidget() override;
void loadConfig() override;
void setOpsWidget(DataGridOpsWidget* w);

2
src/debugger/gui/RiotRamWidget.hxx
View File

@ -34,7 +34,7 @@ class RiotRamWidget : public RamWidget
public:
RiotRamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w);
virtual ~RiotRamWidget() = default;
~RiotRamWidget() override = default;
private:
uInt8 getValue(int addr) const override;

2
src/debugger/gui/RiotWidget.hxx
View File

@ -34,7 +34,7 @@ class RiotWidget : public Widget, public CommandSender
public:
RiotWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~RiotWidget() = default;
~RiotWidget() override = default;
private:
ControllerWidget* addControlWidget(GuiObject* boss, const GUI::Font& font,

2
src/debugger/gui/RomListSettings.hxx
View File

@ -32,7 +32,7 @@ class RomListSettings : public Dialog, public CommandSender
{
public:
RomListSettings(GuiObject* boss, const GUI::Font& font);
virtual ~RomListSettings() = default;
~RomListSettings() override = default;
/** Show dialog onscreen at the specified coordinates
('data' will be the currently selected line number in RomListWidget) */

2
src/debugger/gui/RomListWidget.hxx
View File

@ -47,7 +47,7 @@ class RomListWidget : public EditableWidget
public:
RomListWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~RomListWidget() = default;
~RomListWidget() override = default;
void setList(const CartDebug::Disassembly& disasm);

2
src/debugger/gui/RomWidget.hxx
View File

@ -37,7 +37,7 @@ class RomWidget : public Widget, public CommandSender
public:
RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~RomWidget() = default;
~RomWidget() override = default;
void invalidate(bool forcereload = true)
{ myListIsDirty = true; if(forcereload) loadConfig(); }

2
src/debugger/gui/SaveKeyWidget.hxx
View File

@ -27,7 +27,7 @@ class SaveKeyWidget : public FlashWidget
public:
SaveKeyWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~SaveKeyWidget() = default;
~SaveKeyWidget() override = default;
private:
void eraseCurrent() override;

2
src/debugger/gui/TiaInfoWidget.hxx
View File

@ -31,7 +31,7 @@ class TiaInfoWidget : public Widget, public CommandSender
public:
TiaInfoWidget(GuiObject *boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int max_w);
virtual ~TiaInfoWidget() = default;
~TiaInfoWidget() override = default;
void loadConfig() override;

2
src/debugger/gui/TiaOutputWidget.hxx
View File

@ -31,7 +31,7 @@ class TiaOutputWidget : public Widget, public CommandSender
public:
TiaOutputWidget(GuiObject *boss, const GUI::Font& font,
int x, int y, int w, int h);
virtual ~TiaOutputWidget() = default;
~TiaOutputWidget() override = default;
void loadConfig() override;
void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }

2
src/debugger/gui/TiaWidget.hxx
View File

@ -36,7 +36,7 @@ class TiaWidget : public Widget, public CommandSender
public:
TiaWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h);
virtual ~TiaWidget() = default;
~TiaWidget() override = default;
private:
DataGridWidget* myColorRegs{nullptr};

2
src/debugger/gui/TiaZoomWidget.hxx
View File

@ -29,7 +29,7 @@ class TiaZoomWidget : public Widget, public CommandSender
public:
TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
int x, int y, int w, int h);
virtual ~TiaZoomWidget() = default;
~TiaZoomWidget() override = default;
void loadConfig() override;
void setPos(int x, int y);

2
src/debugger/gui/ToggleBitWidget.hxx
View File

@ -26,7 +26,7 @@ class ToggleBitWidget : public ToggleWidget
public:
ToggleBitWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int cols, int rows, int colchars = 1);
virtual ~ToggleBitWidget() = default;
~ToggleBitWidget() override = default;
void setList(const StringList& off, const StringList& on);
void setState(const BoolArray& state, const BoolArray& changed);

2
src/debugger/gui/TogglePixelWidget.hxx
View File

@ -26,7 +26,7 @@ class TogglePixelWidget : public ToggleWidget
public:
TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int cols, int rows);
virtual ~TogglePixelWidget() = default;
~TogglePixelWidget() override = default;
void setColor(ColorId color) { _pixelColor = color; }
void clearColor() { _pixelColor = kDlgColor; }

2
src/debugger/gui/ToggleWidget.hxx
View File

@ -35,7 +35,7 @@ class ToggleWidget : public Widget, public CommandSender
ToggleWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int cols, int rows,
int clicksToChange = 2);
virtual ~ToggleWidget() = default;
~ToggleWidget() override = default;
const BoolArray& getState() { return _stateList; }
bool getSelectedState() const { return _stateList[_selectedItem]; }

2
src/debugger/gui/TrakBallWidget.hxx
View File

@ -28,7 +28,7 @@ class TrakBallWidget : public PointingDeviceWidget
TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~TrakBallWidget() = default;
~TrakBallWidget() override = default;
private:
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b01, 0b11 };

2
src/emucore/AmigaMouse.hxx
View File

@ -33,7 +33,7 @@ class AmigaMouse : public PointingDevice
AmigaMouse(Jack jack, const Event& event, const System& system)
: PointingDevice(jack, event, system, Controller::Type::AmigaMouse,
trackballSensitivity) { }
virtual ~AmigaMouse() = default;
~AmigaMouse() override = default;
/**
Returns the name of this controller.

2
src/emucore/AtariMouse.hxx
View File

@ -33,7 +33,7 @@ class AtariMouse : public PointingDevice
AtariMouse(Jack jack, const Event& event, const System& system)
: PointingDevice(jack, event, system, Controller::Type::AtariMouse,
trackballSensitivity) { }
virtual ~AtariMouse() = default;
~AtariMouse() override = default;
/**
Returns the name of this controller.

Some files were not shown because too many files have changed in this diff Show More