diff --git a/src/cheat/BankRomCheat.hxx b/src/cheat/BankRomCheat.hxx index add1b5481..c8360eb27 100644 --- a/src/cheat/BankRomCheat.hxx +++ b/src/cheat/BankRomCheat.hxx @@ -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; diff --git a/src/cheat/CheatCodeDialog.hxx b/src/cheat/CheatCodeDialog.hxx index 51615f702..9ac69740c 100644 --- a/src/cheat/CheatCodeDialog.hxx +++ b/src/cheat/CheatCodeDialog.hxx @@ -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; diff --git a/src/cheat/CheetahCheat.hxx b/src/cheat/CheetahCheat.hxx index c82baedb2..c5a2e1384 100644 --- a/src/cheat/CheetahCheat.hxx +++ b/src/cheat/CheetahCheat.hxx @@ -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; diff --git a/src/cheat/RamCheat.hxx b/src/cheat/RamCheat.hxx index 57fcf7968..a7a522973 100644 --- a/src/cheat/RamCheat.hxx +++ b/src/cheat/RamCheat.hxx @@ -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; diff --git a/src/common/EventHandlerSDL2.cxx b/src/common/EventHandlerSDL2.cxx index 57569a6c1..2e8b60323 100644 --- a/src/common/EventHandlerSDL2.cxx +++ b/src/common/EventHandlerSDL2.cxx @@ -220,7 +220,6 @@ void EventHandlerSDL2::pollEvent() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EventHandlerSDL2::JoystickSDL2::JoystickSDL2(int idx) - : myStick(nullptr) { ASSERT_MAIN_THREAD; diff --git a/src/common/EventHandlerSDL2.hxx b/src/common/EventHandlerSDL2.hxx index 840b1fadb..2fea58371 100644 --- a/src/common/EventHandlerSDL2.hxx +++ b/src/common/EventHandlerSDL2.hxx @@ -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: diff --git a/src/common/FBSurfaceSDL2.hxx b/src/common/FBSurfaceSDL2.hxx index cf927c0f9..62e9d96a2 100644 --- a/src/common/FBSurfaceSDL2.hxx +++ b/src/common/FBSurfaceSDL2.hxx @@ -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 diff --git a/src/common/FrameBufferSDL2.hxx b/src/common/FrameBufferSDL2.hxx index 7904ed0ee..0b3386d08 100644 --- a/src/common/FrameBufferSDL2.hxx +++ b/src/common/FrameBufferSDL2.hxx @@ -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 diff --git a/src/common/PaletteHandler.hxx b/src/common/PaletteHandler.hxx index ed46da516..956fcf9b3 100644 --- a/src/common/PaletteHandler.hxx +++ b/src/common/PaletteHandler.hxx @@ -54,7 +54,6 @@ class PaletteHandler public: PaletteHandler(OSystem& system); - virtual ~PaletteHandler() = default; /** Cycle through available palettes. diff --git a/src/common/SoundNull.hxx b/src/common/SoundNull.hxx index 6bd9db54d..24dfa4620 100644 --- a/src/common/SoundNull.hxx +++ b/src/common/SoundNull.hxx @@ -43,11 +43,7 @@ class SoundNull : public Sound { Logger::info("Sound disabled.\n"); } - - /** - Destructor - */ - virtual ~SoundNull() = default; + ~SoundNull() override = default; public: /** diff --git a/src/common/SoundSDL2.hxx b/src/common/SoundSDL2.hxx index 586e90ff8..e760aa70b 100644 --- a/src/common/SoundSDL2.hxx +++ b/src/common/SoundSDL2.hxx @@ -48,7 +48,7 @@ class SoundSDL2 : public Sound /** Destructor */ - virtual ~SoundSDL2(); + ~SoundSDL2() override; public: /** diff --git a/src/common/sdl_blitter/BilinearBlitter.hxx b/src/common/sdl_blitter/BilinearBlitter.hxx index 84c550ad1..8588e390e 100644 --- a/src/common/sdl_blitter/BilinearBlitter.hxx +++ b/src/common/sdl_blitter/BilinearBlitter.hxx @@ -29,7 +29,7 @@ class BilinearBlitter : public Blitter { BilinearBlitter(FrameBufferSDL2& fb, bool interpolate); - virtual ~BilinearBlitter(); + ~BilinearBlitter() override; virtual void reinitialize( SDL_Rect srcRect, diff --git a/src/common/sdl_blitter/QisBlitter.hxx b/src/common/sdl_blitter/QisBlitter.hxx index 14ee84fcc..9aa68e4c0 100644 --- a/src/common/sdl_blitter/QisBlitter.hxx +++ b/src/common/sdl_blitter/QisBlitter.hxx @@ -31,7 +31,7 @@ class QisBlitter : public Blitter { static bool isSupported(FrameBufferSDL2 &fb); - virtual ~QisBlitter(); + ~QisBlitter() override; virtual void reinitialize( SDL_Rect srcRect, diff --git a/src/debugger/CartDebug.hxx b/src/debugger/CartDebug.hxx index 4ab326be1..9d71de51b 100644 --- a/src/debugger/CartDebug.hxx +++ b/src/debugger/CartDebug.hxx @@ -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; } diff --git a/src/debugger/Debugger.hxx b/src/debugger/Debugger.hxx index 6083d556a..6435a6d1a 100644 --- a/src/debugger/Debugger.hxx +++ b/src/debugger/Debugger.hxx @@ -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; diff --git a/src/debugger/DebuggerSystem.hxx b/src/debugger/DebuggerSystem.hxx index 904b0beed..acdf78389 100644 --- a/src/debugger/DebuggerSystem.hxx +++ b/src/debugger/DebuggerSystem.hxx @@ -31,7 +31,7 @@ class DebuggerState { public: DebuggerState() = default; - ~DebuggerState() = default; + virtual ~DebuggerState() = default; DebuggerState(const DebuggerState&) = default; DebuggerState(DebuggerState&&) = delete; diff --git a/src/debugger/gui/AmigaMouseWidget.hxx b/src/debugger/gui/AmigaMouseWidget.hxx index 622a24a9e..520f3f886 100644 --- a/src/debugger/gui/AmigaMouseWidget.hxx +++ b/src/debugger/gui/AmigaMouseWidget.hxx @@ -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 myGrayCodeTable = { 0b00, 0b10, 0b11, 0b01 }; diff --git a/src/debugger/gui/AtariMouseWidget.hxx b/src/debugger/gui/AtariMouseWidget.hxx index 904430721..2b3554630 100644 --- a/src/debugger/gui/AtariMouseWidget.hxx +++ b/src/debugger/gui/AtariMouseWidget.hxx @@ -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 myGrayCodeTable = { 0b00, 0b01, 0b11, 0b10 }; diff --git a/src/debugger/gui/AtariVoxWidget.hxx b/src/debugger/gui/AtariVoxWidget.hxx index c205b811d..cf168173d 100644 --- a/src/debugger/gui/AtariVoxWidget.hxx +++ b/src/debugger/gui/AtariVoxWidget.hxx @@ -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; diff --git a/src/debugger/gui/AudioWidget.hxx b/src/debugger/gui/AudioWidget.hxx index a1a0790ce..7427fe477 100644 --- a/src/debugger/gui/AudioWidget.hxx +++ b/src/debugger/gui/AudioWidget.hxx @@ -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 diff --git a/src/debugger/gui/BoosterWidget.hxx b/src/debugger/gui/BoosterWidget.hxx index 09a29cd0f..e82d16888 100644 --- a/src/debugger/gui/BoosterWidget.hxx +++ b/src/debugger/gui/BoosterWidget.hxx @@ -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 }; diff --git a/src/debugger/gui/Cart0840Widget.hxx b/src/debugger/gui/Cart0840Widget.hxx index 00605b262..49e2ed8df 100644 --- a/src/debugger/gui/Cart0840Widget.hxx +++ b/src/debugger/gui/Cart0840Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/Cart2KWidget.hxx b/src/debugger/gui/Cart2KWidget.hxx index 123e3ddf5..e41fe3915 100644 --- a/src/debugger/gui/Cart2KWidget.hxx +++ b/src/debugger/gui/Cart2KWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/Cart3EPlusWidget.hxx b/src/debugger/gui/Cart3EPlusWidget.hxx index 44473e0cf..e7d47e041 100644 --- a/src/debugger/gui/Cart3EPlusWidget.hxx +++ b/src/debugger/gui/Cart3EPlusWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/Cart3EWidget.hxx b/src/debugger/gui/Cart3EWidget.hxx index 424d9a577..c6c2b2180 100644 --- a/src/debugger/gui/Cart3EWidget.hxx +++ b/src/debugger/gui/Cart3EWidget.hxx @@ -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 { diff --git a/src/debugger/gui/Cart3FWidget.hxx b/src/debugger/gui/Cart3FWidget.hxx index ad24d8e56..8e73988d9 100644 --- a/src/debugger/gui/Cart3FWidget.hxx +++ b/src/debugger/gui/Cart3FWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/Cart4A50Widget.hxx b/src/debugger/gui/Cart4A50Widget.hxx index 180cf24c4..5df9576e9 100644 --- a/src/debugger/gui/Cart4A50Widget.hxx +++ b/src/debugger/gui/Cart4A50Widget.hxx @@ -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; diff --git a/src/debugger/gui/Cart4KSCWidget.hxx b/src/debugger/gui/Cart4KSCWidget.hxx index 624a5623a..3ac605dc1 100644 --- a/src/debugger/gui/Cart4KSCWidget.hxx +++ b/src/debugger/gui/Cart4KSCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/Cart4KWidget.hxx b/src/debugger/gui/Cart4KWidget.hxx index 3fd18eb66..19d3c70b0 100644 --- a/src/debugger/gui/Cart4KWidget.hxx +++ b/src/debugger/gui/Cart4KWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartARWidget.hxx b/src/debugger/gui/CartARWidget.hxx index 52e46c595..22fb85bcb 100644 --- a/src/debugger/gui/CartARWidget.hxx +++ b/src/debugger/gui/CartARWidget.hxx @@ -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; diff --git a/src/debugger/gui/CartBFSCWidget.hxx b/src/debugger/gui/CartBFSCWidget.hxx index 739f41388..ecc1c5b71 100644 --- a/src/debugger/gui/CartBFSCWidget.hxx +++ b/src/debugger/gui/CartBFSCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartBFWidget.hxx b/src/debugger/gui/CartBFWidget.hxx index b67391c63..b2effb8ba 100644 --- a/src/debugger/gui/CartBFWidget.hxx +++ b/src/debugger/gui/CartBFWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartBUSWidget.hxx b/src/debugger/gui/CartBUSWidget.hxx index 09d23e784..cf975f18b 100644 --- a/src/debugger/gui/CartBUSWidget.hxx +++ b/src/debugger/gui/CartBUSWidget.hxx @@ -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 { diff --git a/src/debugger/gui/CartCDFInfoWidget.hxx b/src/debugger/gui/CartCDFInfoWidget.hxx index 1a003e2bd..c7867a38d 100644 --- a/src/debugger/gui/CartCDFInfoWidget.hxx +++ b/src/debugger/gui/CartCDFInfoWidget.hxx @@ -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); diff --git a/src/debugger/gui/CartCDFWidget.hxx b/src/debugger/gui/CartCDFWidget.hxx index c0591d795..fdf5622a9 100644 --- a/src/debugger/gui/CartCDFWidget.hxx +++ b/src/debugger/gui/CartCDFWidget.hxx @@ -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 { diff --git a/src/debugger/gui/CartCMWidget.hxx b/src/debugger/gui/CartCMWidget.hxx index 04651666b..2ee085000 100644 --- a/src/debugger/gui/CartCMWidget.hxx +++ b/src/debugger/gui/CartCMWidget.hxx @@ -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 { diff --git a/src/debugger/gui/CartCTYWidget.hxx b/src/debugger/gui/CartCTYWidget.hxx index 18caa76a5..7c7ec24bd 100644 --- a/src/debugger/gui/CartCTYWidget.hxx +++ b/src/debugger/gui/CartCTYWidget.hxx @@ -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; diff --git a/src/debugger/gui/CartCVWidget.hxx b/src/debugger/gui/CartCVWidget.hxx index 63fc6f237..079cc76f1 100644 --- a/src/debugger/gui/CartCVWidget.hxx +++ b/src/debugger/gui/CartCVWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartDFSCWidget.hxx b/src/debugger/gui/CartDFSCWidget.hxx index 9e4481fa8..9017e253b 100644 --- a/src/debugger/gui/CartDFSCWidget.hxx +++ b/src/debugger/gui/CartDFSCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartDFWidget.hxx b/src/debugger/gui/CartDFWidget.hxx index 9b45552b9..df7acaf05 100644 --- a/src/debugger/gui/CartDFWidget.hxx +++ b/src/debugger/gui/CartDFWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartDPCPlusWidget.hxx b/src/debugger/gui/CartDPCPlusWidget.hxx index 88e38d2e6..2e800dd28 100644 --- a/src/debugger/gui/CartDPCPlusWidget.hxx +++ b/src/debugger/gui/CartDPCPlusWidget.hxx @@ -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 { diff --git a/src/debugger/gui/CartDPCWidget.hxx b/src/debugger/gui/CartDPCWidget.hxx index 0a675a2c8..2beeacead 100644 --- a/src/debugger/gui/CartDPCWidget.hxx +++ b/src/debugger/gui/CartDPCWidget.hxx @@ -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 { diff --git a/src/debugger/gui/CartDebugWidget.hxx b/src/debugger/gui/CartDebugWidget.hxx index 27c3befa5..22554a472 100644 --- a/src/debugger/gui/CartDebugWidget.hxx +++ b/src/debugger/gui/CartDebugWidget.hxx @@ -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, diff --git a/src/debugger/gui/CartE0Widget.hxx b/src/debugger/gui/CartE0Widget.hxx index a50893e84..9c8ab185f 100644 --- a/src/debugger/gui/CartE0Widget.hxx +++ b/src/debugger/gui/CartE0Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartE78KWidget.hxx b/src/debugger/gui/CartE78KWidget.hxx index 7007e7aef..1b28de3ee 100644 --- a/src/debugger/gui/CartE78KWidget.hxx +++ b/src/debugger/gui/CartE78KWidget.hxx @@ -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; diff --git a/src/debugger/gui/CartE7Widget.hxx b/src/debugger/gui/CartE7Widget.hxx index 8258f6ed1..3620529c7 100644 --- a/src/debugger/gui/CartE7Widget.hxx +++ b/src/debugger/gui/CartE7Widget.hxx @@ -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; diff --git a/src/debugger/gui/CartEFSCWidget.hxx b/src/debugger/gui/CartEFSCWidget.hxx index 975f17f8a..c5517e9c0 100644 --- a/src/debugger/gui/CartEFSCWidget.hxx +++ b/src/debugger/gui/CartEFSCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartEFWidget.hxx b/src/debugger/gui/CartEFWidget.hxx index 7d173836a..6e0407046 100644 --- a/src/debugger/gui/CartEFWidget.hxx +++ b/src/debugger/gui/CartEFWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartEnhancedWidget.hxx b/src/debugger/gui/CartEnhancedWidget.hxx index a367e8def..bebbdcf5d 100644 --- a/src/debugger/gui/CartEnhancedWidget.hxx +++ b/src/debugger/gui/CartEnhancedWidget.hxx @@ -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(); diff --git a/src/debugger/gui/CartF0Widget.hxx b/src/debugger/gui/CartF0Widget.hxx index 017d88e78..b772489cf 100644 --- a/src/debugger/gui/CartF0Widget.hxx +++ b/src/debugger/gui/CartF0Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF4SCWidget.hxx b/src/debugger/gui/CartF4SCWidget.hxx index c6570a9fa..fccc1294f 100644 --- a/src/debugger/gui/CartF4SCWidget.hxx +++ b/src/debugger/gui/CartF4SCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF4Widget.hxx b/src/debugger/gui/CartF4Widget.hxx index d444a5956..67669cd32 100644 --- a/src/debugger/gui/CartF4Widget.hxx +++ b/src/debugger/gui/CartF4Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF6SCWidget.hxx b/src/debugger/gui/CartF6SCWidget.hxx index 1ed6378a7..ce34c61ea 100644 --- a/src/debugger/gui/CartF6SCWidget.hxx +++ b/src/debugger/gui/CartF6SCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF6Widget.hxx b/src/debugger/gui/CartF6Widget.hxx index 2d0eb3734..3aafaf07c 100644 --- a/src/debugger/gui/CartF6Widget.hxx +++ b/src/debugger/gui/CartF6Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF8SCWidget.hxx b/src/debugger/gui/CartF8SCWidget.hxx index 3f6199783..22b22fd71 100644 --- a/src/debugger/gui/CartF8SCWidget.hxx +++ b/src/debugger/gui/CartF8SCWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartF8Widget.hxx b/src/debugger/gui/CartF8Widget.hxx index a0577f250..7f7d4514b 100644 --- a/src/debugger/gui/CartF8Widget.hxx +++ b/src/debugger/gui/CartF8Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartFA2Widget.hxx b/src/debugger/gui/CartFA2Widget.hxx index 06865c495..d697ac783 100644 --- a/src/debugger/gui/CartFA2Widget.hxx +++ b/src/debugger/gui/CartFA2Widget.hxx @@ -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; diff --git a/src/debugger/gui/CartFAWidget.hxx b/src/debugger/gui/CartFAWidget.hxx index 2d7311a71..8d278e4e8 100644 --- a/src/debugger/gui/CartFAWidget.hxx +++ b/src/debugger/gui/CartFAWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartFCWidget.hxx b/src/debugger/gui/CartFCWidget.hxx index f6d56af71..9e0a2a54a 100644 --- a/src/debugger/gui/CartFCWidget.hxx +++ b/src/debugger/gui/CartFCWidget.hxx @@ -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."; } diff --git a/src/debugger/gui/CartFEWidget.hxx b/src/debugger/gui/CartFEWidget.hxx index 468fcc144..a8d0e22a0 100644 --- a/src/debugger/gui/CartFEWidget.hxx +++ b/src/debugger/gui/CartFEWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartMDMWidget.hxx b/src/debugger/gui/CartMDMWidget.hxx index c7add24d7..2927aceb5 100644 --- a/src/debugger/gui/CartMDMWidget.hxx +++ b/src/debugger/gui/CartMDMWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartMNetworkWidget.hxx b/src/debugger/gui/CartMNetworkWidget.hxx index 4f0a5a0db..c8b258b4f 100644 --- a/src/debugger/gui/CartMNetworkWidget.hxx +++ b/src/debugger/gui/CartMNetworkWidget.hxx @@ -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; diff --git a/src/debugger/gui/CartRamWidget.hxx b/src/debugger/gui/CartRamWidget.hxx index 73aa698d0..bc0f4f810 100644 --- a/src/debugger/gui/CartRamWidget.hxx +++ b/src/debugger/gui/CartRamWidget.hxx @@ -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; diff --git a/src/debugger/gui/CartSBWidget.hxx b/src/debugger/gui/CartSBWidget.hxx index 91cc90ec1..646865889 100644 --- a/src/debugger/gui/CartSBWidget.hxx +++ b/src/debugger/gui/CartSBWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartTVBoyWidget.hxx b/src/debugger/gui/CartTVBoyWidget.hxx index e1c2780e6..709ddec2d 100644 --- a/src/debugger/gui/CartTVBoyWidget.hxx +++ b/src/debugger/gui/CartTVBoyWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartUAWidget.hxx b/src/debugger/gui/CartUAWidget.hxx index a610a1316..efbce802a 100644 --- a/src/debugger/gui/CartUAWidget.hxx +++ b/src/debugger/gui/CartUAWidget.hxx @@ -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"; } diff --git a/src/debugger/gui/CartWDWidget.hxx b/src/debugger/gui/CartWDWidget.hxx index 2ccdd7437..f68f1d96b 100644 --- a/src/debugger/gui/CartWDWidget.hxx +++ b/src/debugger/gui/CartWDWidget.hxx @@ -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: diff --git a/src/debugger/gui/CartX07Widget.hxx b/src/debugger/gui/CartX07Widget.hxx index 58492e7e6..4d94fe2ab 100644 --- a/src/debugger/gui/CartX07Widget.hxx +++ b/src/debugger/gui/CartX07Widget.hxx @@ -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"; } diff --git a/src/debugger/gui/ControllerWidget.hxx b/src/debugger/gui/ControllerWidget.hxx index d14c1ba69..e45ae2168 100644 --- a/src/debugger/gui/ControllerWidget.hxx +++ b/src/debugger/gui/ControllerWidget.hxx @@ -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 { } diff --git a/src/debugger/gui/CpuWidget.hxx b/src/debugger/gui/CpuWidget.hxx index 5992970f3..5d4a4893c 100644 --- a/src/debugger/gui/CpuWidget.hxx +++ b/src/debugger/gui/CpuWidget.hxx @@ -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; diff --git a/src/debugger/gui/DataGridOpsWidget.hxx b/src/debugger/gui/DataGridOpsWidget.hxx index b40268d1c..d4d481ec9 100644 --- a/src/debugger/gui/DataGridOpsWidget.hxx +++ b/src/debugger/gui/DataGridOpsWidget.hxx @@ -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); diff --git a/src/debugger/gui/DataGridWidget.hxx b/src/debugger/gui/DataGridWidget.hxx index 7810e2af9..f7d9988c5 100644 --- a/src/debugger/gui/DataGridWidget.hxx +++ b/src/debugger/gui/DataGridWidget.hxx @@ -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); diff --git a/src/debugger/gui/DebuggerDialog.hxx b/src/debugger/gui/DebuggerDialog.hxx index f38e8b2dc..0affa5160 100644 --- a/src/debugger/gui/DebuggerDialog.hxx +++ b/src/debugger/gui/DebuggerDialog.hxx @@ -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; } diff --git a/src/debugger/gui/DelayQueueWidget.hxx b/src/debugger/gui/DelayQueueWidget.hxx index bc1d2a8ec..e1eddc399 100644 --- a/src/debugger/gui/DelayQueueWidget.hxx +++ b/src/debugger/gui/DelayQueueWidget.hxx @@ -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; diff --git a/src/debugger/gui/DrivingWidget.hxx b/src/debugger/gui/DrivingWidget.hxx index 711415d31..0ab6c1d15 100644 --- a/src/debugger/gui/DrivingWidget.hxx +++ b/src/debugger/gui/DrivingWidget.hxx @@ -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 { diff --git a/src/debugger/gui/FlashWidget.hxx b/src/debugger/gui/FlashWidget.hxx index b811ac9c2..cb085be9d 100644 --- a/src/debugger/gui/FlashWidget.hxx +++ b/src/debugger/gui/FlashWidget.hxx @@ -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); diff --git a/src/debugger/gui/GenesisWidget.hxx b/src/debugger/gui/GenesisWidget.hxx index aa3098f8f..b16db9c9b 100644 --- a/src/debugger/gui/GenesisWidget.hxx +++ b/src/debugger/gui/GenesisWidget.hxx @@ -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 }; diff --git a/src/debugger/gui/JoystickWidget.hxx b/src/debugger/gui/JoystickWidget.hxx index e0a550a6f..1c1143b7f 100644 --- a/src/debugger/gui/JoystickWidget.hxx +++ b/src/debugger/gui/JoystickWidget.hxx @@ -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 }; diff --git a/src/debugger/gui/KeyboardWidget.hxx b/src/debugger/gui/KeyboardWidget.hxx index b88434ef6..ca0a5984f 100644 --- a/src/debugger/gui/KeyboardWidget.hxx +++ b/src/debugger/gui/KeyboardWidget.hxx @@ -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 myBox{nullptr}; diff --git a/src/debugger/gui/NullControlWidget.hxx b/src/debugger/gui/NullControlWidget.hxx index 7b7c83e73..79364ca6e 100644 --- a/src/debugger/gui/NullControlWidget.hxx +++ b/src/debugger/gui/NullControlWidget.hxx @@ -44,7 +44,7 @@ class NullControlWidget : public ControllerWidget TextAlign::Center); } - virtual ~NullControlWidget() = default; + ~NullControlWidget() override = default; private: // Following constructors and assignment operators not supported diff --git a/src/debugger/gui/PaddleWidget.hxx b/src/debugger/gui/PaddleWidget.hxx index 1966299d8..8773b5a1d 100644 --- a/src/debugger/gui/PaddleWidget.hxx +++ b/src/debugger/gui/PaddleWidget.hxx @@ -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', diff --git a/src/debugger/gui/PointingDeviceWidget.hxx b/src/debugger/gui/PointingDeviceWidget.hxx index 192f2519a..ae6157582 100644 --- a/src/debugger/gui/PointingDeviceWidget.hxx +++ b/src/debugger/gui/PointingDeviceWidget.hxx @@ -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 { diff --git a/src/debugger/gui/PromptWidget.hxx b/src/debugger/gui/PromptWidget.hxx index a58e16076..0570f025f 100644 --- a/src/debugger/gui/PromptWidget.hxx +++ b/src/debugger/gui/PromptWidget.hxx @@ -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, ...); diff --git a/src/debugger/gui/RamWidget.hxx b/src/debugger/gui/RamWidget.hxx index 7c4ea99ef..3562187fb 100644 --- a/src/debugger/gui/RamWidget.hxx +++ b/src/debugger/gui/RamWidget.hxx @@ -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); diff --git a/src/debugger/gui/RiotRamWidget.hxx b/src/debugger/gui/RiotRamWidget.hxx index 694b9af71..53d006bb0 100644 --- a/src/debugger/gui/RiotRamWidget.hxx +++ b/src/debugger/gui/RiotRamWidget.hxx @@ -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; diff --git a/src/debugger/gui/RiotWidget.hxx b/src/debugger/gui/RiotWidget.hxx index 3feb25ee3..fdfd699ef 100644 --- a/src/debugger/gui/RiotWidget.hxx +++ b/src/debugger/gui/RiotWidget.hxx @@ -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, diff --git a/src/debugger/gui/RomListSettings.hxx b/src/debugger/gui/RomListSettings.hxx index ba65c24a4..0845dd8ab 100644 --- a/src/debugger/gui/RomListSettings.hxx +++ b/src/debugger/gui/RomListSettings.hxx @@ -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) */ diff --git a/src/debugger/gui/RomListWidget.hxx b/src/debugger/gui/RomListWidget.hxx index 24861b157..40abb0adf 100644 --- a/src/debugger/gui/RomListWidget.hxx +++ b/src/debugger/gui/RomListWidget.hxx @@ -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); diff --git a/src/debugger/gui/RomWidget.hxx b/src/debugger/gui/RomWidget.hxx index 8dc4aabee..adf9a4443 100644 --- a/src/debugger/gui/RomWidget.hxx +++ b/src/debugger/gui/RomWidget.hxx @@ -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(); } diff --git a/src/debugger/gui/SaveKeyWidget.hxx b/src/debugger/gui/SaveKeyWidget.hxx index 287e98c22..3a646f2d4 100644 --- a/src/debugger/gui/SaveKeyWidget.hxx +++ b/src/debugger/gui/SaveKeyWidget.hxx @@ -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; diff --git a/src/debugger/gui/TiaInfoWidget.hxx b/src/debugger/gui/TiaInfoWidget.hxx index cfea723fb..2f7796162 100644 --- a/src/debugger/gui/TiaInfoWidget.hxx +++ b/src/debugger/gui/TiaInfoWidget.hxx @@ -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; diff --git a/src/debugger/gui/TiaOutputWidget.hxx b/src/debugger/gui/TiaOutputWidget.hxx index 722eac6aa..c7bfd26f6 100644 --- a/src/debugger/gui/TiaOutputWidget.hxx +++ b/src/debugger/gui/TiaOutputWidget.hxx @@ -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; } diff --git a/src/debugger/gui/TiaWidget.hxx b/src/debugger/gui/TiaWidget.hxx index bc6c6c632..1f058d555 100644 --- a/src/debugger/gui/TiaWidget.hxx +++ b/src/debugger/gui/TiaWidget.hxx @@ -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}; diff --git a/src/debugger/gui/TiaZoomWidget.hxx b/src/debugger/gui/TiaZoomWidget.hxx index 91e511bda..d4d3a9835 100644 --- a/src/debugger/gui/TiaZoomWidget.hxx +++ b/src/debugger/gui/TiaZoomWidget.hxx @@ -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); diff --git a/src/debugger/gui/ToggleBitWidget.hxx b/src/debugger/gui/ToggleBitWidget.hxx index 0f595091b..6d5505030 100644 --- a/src/debugger/gui/ToggleBitWidget.hxx +++ b/src/debugger/gui/ToggleBitWidget.hxx @@ -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); diff --git a/src/debugger/gui/TogglePixelWidget.hxx b/src/debugger/gui/TogglePixelWidget.hxx index 06dbc508d..6177cac45 100644 --- a/src/debugger/gui/TogglePixelWidget.hxx +++ b/src/debugger/gui/TogglePixelWidget.hxx @@ -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; } diff --git a/src/debugger/gui/ToggleWidget.hxx b/src/debugger/gui/ToggleWidget.hxx index b7540a90c..67777a13a 100644 --- a/src/debugger/gui/ToggleWidget.hxx +++ b/src/debugger/gui/ToggleWidget.hxx @@ -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]; } diff --git a/src/debugger/gui/TrakBallWidget.hxx b/src/debugger/gui/TrakBallWidget.hxx index 1ac611ec3..470cd95b7 100644 --- a/src/debugger/gui/TrakBallWidget.hxx +++ b/src/debugger/gui/TrakBallWidget.hxx @@ -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 myGrayCodeTable = { 0b00, 0b10, 0b01, 0b11 }; diff --git a/src/emucore/AmigaMouse.hxx b/src/emucore/AmigaMouse.hxx index d34281d4d..1973cb3e3 100644 --- a/src/emucore/AmigaMouse.hxx +++ b/src/emucore/AmigaMouse.hxx @@ -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. diff --git a/src/emucore/AtariMouse.hxx b/src/emucore/AtariMouse.hxx index 2ecb587c4..1696aa67d 100644 --- a/src/emucore/AtariMouse.hxx +++ b/src/emucore/AtariMouse.hxx @@ -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. diff --git a/src/emucore/AtariVox.hxx b/src/emucore/AtariVox.hxx index 132b2c377..d868338ed 100644 --- a/src/emucore/AtariVox.hxx +++ b/src/emucore/AtariVox.hxx @@ -50,7 +50,7 @@ class AtariVox : public SaveKey AtariVox(Jack jack, const Event& event, const System& system, const string& portname, const FilesystemNode& eepromfile, const onMessageCallback& callback); - virtual ~AtariVox(); + ~AtariVox() override; public: using Controller::read; diff --git a/src/emucore/Booster.hxx b/src/emucore/Booster.hxx index 866c90811..97d519da7 100644 --- a/src/emucore/Booster.hxx +++ b/src/emucore/Booster.hxx @@ -39,7 +39,7 @@ class BoosterGrip : public Controller @param system The system using this controller */ BoosterGrip(Jack jack, const Event& event, const System& system); - virtual ~BoosterGrip() = default; + ~BoosterGrip() override = default; public: /** diff --git a/src/emucore/Cart.hxx b/src/emucore/Cart.hxx index 008135a73..5c3b65af2 100644 --- a/src/emucore/Cart.hxx +++ b/src/emucore/Cart.hxx @@ -60,7 +60,7 @@ class Cartridge : public Device @param md5 The md5sum of the cart image */ Cartridge(const Settings& settings, const string& md5); - virtual ~Cartridge() = default; + ~Cartridge() override = default; /** Set/query some information about this cartridge. diff --git a/src/emucore/Cart0840.hxx b/src/emucore/Cart0840.hxx index 0d120aad4..2ac1dca71 100644 --- a/src/emucore/Cart0840.hxx +++ b/src/emucore/Cart0840.hxx @@ -48,7 +48,7 @@ class Cartridge0840 : public CartridgeEnhanced */ Cartridge0840(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~Cartridge0840() = default; + ~Cartridge0840() override = default; public: /** diff --git a/src/emucore/Cart2K.hxx b/src/emucore/Cart2K.hxx index 878df4714..5d2542c55 100644 --- a/src/emucore/Cart2K.hxx +++ b/src/emucore/Cart2K.hxx @@ -51,7 +51,7 @@ class Cartridge2K : public CartridgeEnhanced */ Cartridge2K(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 2_KB); - virtual ~Cartridge2K() = default; + ~Cartridge2K() override = default; public: /** diff --git a/src/emucore/Cart3E.hxx b/src/emucore/Cart3E.hxx index 60e50613a..a181b84d9 100644 --- a/src/emucore/Cart3E.hxx +++ b/src/emucore/Cart3E.hxx @@ -76,7 +76,7 @@ class Cartridge3E : public CartridgeEnhanced */ Cartridge3E(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~Cartridge3E() = default; + ~Cartridge3E() override = default; public: diff --git a/src/emucore/Cart3EPlus.hxx b/src/emucore/Cart3EPlus.hxx index 2ba54d313..bdb8f85f5 100644 --- a/src/emucore/Cart3EPlus.hxx +++ b/src/emucore/Cart3EPlus.hxx @@ -99,7 +99,7 @@ class Cartridge3EPlus: public Cartridge3E */ Cartridge3EPlus(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~Cartridge3EPlus() = default; + ~Cartridge3EPlus() override = default; public: /** Reset device to its power-on state */ diff --git a/src/emucore/Cart3EX.hxx b/src/emucore/Cart3EX.hxx index c949a0c9c..19e33169f 100644 --- a/src/emucore/Cart3EX.hxx +++ b/src/emucore/Cart3EX.hxx @@ -43,7 +43,7 @@ class Cartridge3EX : public Cartridge3E */ Cartridge3EX(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~Cartridge3EX() = default; + ~Cartridge3EX() override = default; public: /** diff --git a/src/emucore/Cart3F.hxx b/src/emucore/Cart3F.hxx index f5eeac809..fee14e97e 100644 --- a/src/emucore/Cart3F.hxx +++ b/src/emucore/Cart3F.hxx @@ -55,7 +55,7 @@ class Cartridge3F : public CartridgeEnhanced */ Cartridge3F(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~Cartridge3F() = default; + ~Cartridge3F() override = default; public: /** diff --git a/src/emucore/Cart4A50.hxx b/src/emucore/Cart4A50.hxx index 8a4fdaa2d..afa3a489c 100644 --- a/src/emucore/Cart4A50.hxx +++ b/src/emucore/Cart4A50.hxx @@ -67,7 +67,7 @@ class Cartridge4A50 : public Cartridge */ Cartridge4A50(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~Cartridge4A50() = default; + ~Cartridge4A50() override = default; public: /** diff --git a/src/emucore/Cart4K.hxx b/src/emucore/Cart4K.hxx index cc2bb5aef..908944b9f 100644 --- a/src/emucore/Cart4K.hxx +++ b/src/emucore/Cart4K.hxx @@ -48,7 +48,7 @@ class Cartridge4K : public CartridgeEnhanced */ Cartridge4K(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 4_KB); - virtual ~Cartridge4K() = default; + ~Cartridge4K() override = default; public: /** diff --git a/src/emucore/Cart4KSC.hxx b/src/emucore/Cart4KSC.hxx index a2197e018..2b90458bd 100644 --- a/src/emucore/Cart4KSC.hxx +++ b/src/emucore/Cart4KSC.hxx @@ -49,7 +49,7 @@ class Cartridge4KSC : public Cartridge4K */ Cartridge4KSC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 4_KB); - virtual ~Cartridge4KSC() = default; + ~Cartridge4KSC() override = default; public: /** diff --git a/src/emucore/CartAR.hxx b/src/emucore/CartAR.hxx index 0b4369f31..6484a415f 100644 --- a/src/emucore/CartAR.hxx +++ b/src/emucore/CartAR.hxx @@ -54,7 +54,7 @@ class CartridgeAR : public Cartridge */ CartridgeAR(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeAR() = default; + ~CartridgeAR() override = default; public: /** diff --git a/src/emucore/CartBF.hxx b/src/emucore/CartBF.hxx index 5190f73da..a0c9d9e1d 100644 --- a/src/emucore/CartBF.hxx +++ b/src/emucore/CartBF.hxx @@ -49,7 +49,7 @@ class CartridgeBF : public CartridgeEnhanced */ CartridgeBF(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 256_KB); - virtual ~CartridgeBF() = default; + ~CartridgeBF() override = default; public: /** diff --git a/src/emucore/CartBFSC.hxx b/src/emucore/CartBFSC.hxx index 4a660ecc8..bc1fa8911 100644 --- a/src/emucore/CartBFSC.hxx +++ b/src/emucore/CartBFSC.hxx @@ -49,7 +49,7 @@ class CartridgeBFSC : public CartridgeBF */ CartridgeBFSC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 256_KB); - virtual ~CartridgeBFSC() = default; + ~CartridgeBFSC() override = default; /** Get a descriptor for the device name (used in error checking). diff --git a/src/emucore/CartBUS.hxx b/src/emucore/CartBUS.hxx index 2e21b5f24..054324353 100644 --- a/src/emucore/CartBUS.hxx +++ b/src/emucore/CartBUS.hxx @@ -56,7 +56,7 @@ class CartridgeBUS : public Cartridge */ CartridgeBUS(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeBUS() = default; + ~CartridgeBUS() override = default; public: /** diff --git a/src/emucore/CartCDF.hxx b/src/emucore/CartCDF.hxx index 99374de2b..d2110a112 100644 --- a/src/emucore/CartCDF.hxx +++ b/src/emucore/CartCDF.hxx @@ -62,7 +62,7 @@ class CartridgeCDF : public Cartridge */ CartridgeCDF(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeCDF() = default; + ~CartridgeCDF() override = default; public: /** diff --git a/src/emucore/CartCM.hxx b/src/emucore/CartCM.hxx index 3a58889b4..0c2ffd0ef 100644 --- a/src/emucore/CartCM.hxx +++ b/src/emucore/CartCM.hxx @@ -122,7 +122,7 @@ class CartridgeCM : public Cartridge */ CartridgeCM(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeCM() = default; + ~CartridgeCM() override = default; public: /** @@ -257,7 +257,7 @@ class CartridgeCM : public Cartridge // Indicates the offset into the ROM image (aligns to current bank) uInt16 myBankOffset{0}; -private: + private: // Following constructors and assignment operators not supported CartridgeCM() = delete; CartridgeCM(const CartridgeCM&) = delete; diff --git a/src/emucore/CartCTY.hxx b/src/emucore/CartCTY.hxx index 5af3ceff4..42c077a2b 100644 --- a/src/emucore/CartCTY.hxx +++ b/src/emucore/CartCTY.hxx @@ -120,7 +120,7 @@ class CartridgeCTY : public Cartridge */ CartridgeCTY(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeCTY() = default; + ~CartridgeCTY() override = default; public: /** diff --git a/src/emucore/CartCV.hxx b/src/emucore/CartCV.hxx index 809d9b373..33c00b256 100644 --- a/src/emucore/CartCV.hxx +++ b/src/emucore/CartCV.hxx @@ -51,7 +51,7 @@ class CartridgeCV : public CartridgeEnhanced */ CartridgeCV(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 2_KB); - virtual ~CartridgeCV() = default; + ~CartridgeCV() override = default; public: /** diff --git a/src/emucore/CartDF.hxx b/src/emucore/CartDF.hxx index 18d0f2489..014aaccd4 100644 --- a/src/emucore/CartDF.hxx +++ b/src/emucore/CartDF.hxx @@ -49,7 +49,7 @@ class CartridgeDF : public CartridgeEnhanced */ CartridgeDF(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 128_KB); - virtual ~CartridgeDF() = default; + ~CartridgeDF() override = default; public: /** diff --git a/src/emucore/CartDFSC.hxx b/src/emucore/CartDFSC.hxx index efc6d30e8..4a30af5c7 100644 --- a/src/emucore/CartDFSC.hxx +++ b/src/emucore/CartDFSC.hxx @@ -49,7 +49,7 @@ class CartridgeDFSC : public CartridgeDF */ CartridgeDFSC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 128_KB); - virtual ~CartridgeDFSC() = default; + ~CartridgeDFSC() override = default; public: /** diff --git a/src/emucore/CartDPC.hxx b/src/emucore/CartDPC.hxx index 4d90fb140..382d5b12f 100644 --- a/src/emucore/CartDPC.hxx +++ b/src/emucore/CartDPC.hxx @@ -50,7 +50,7 @@ class CartridgeDPC : public CartridgeF8 */ CartridgeDPC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 10_KB); - virtual ~CartridgeDPC() = default; + ~CartridgeDPC() override = default; public: /** diff --git a/src/emucore/CartDPCPlus.hxx b/src/emucore/CartDPCPlus.hxx index 04a1b0de4..5c83da263 100644 --- a/src/emucore/CartDPCPlus.hxx +++ b/src/emucore/CartDPCPlus.hxx @@ -58,7 +58,7 @@ class CartridgeDPCPlus : public Cartridge */ CartridgeDPCPlus(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeDPCPlus() = default; + ~CartridgeDPCPlus() override = default; public: /** diff --git a/src/emucore/CartE0.hxx b/src/emucore/CartE0.hxx index 70af8f85d..db6b1e29e 100644 --- a/src/emucore/CartE0.hxx +++ b/src/emucore/CartE0.hxx @@ -57,7 +57,7 @@ class CartridgeE0 : public CartridgeEnhanced */ CartridgeE0(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~CartridgeE0() = default; + ~CartridgeE0() override = default; public: /** diff --git a/src/emucore/CartE7.hxx b/src/emucore/CartE7.hxx index 926fdeaec..07dee06c8 100644 --- a/src/emucore/CartE7.hxx +++ b/src/emucore/CartE7.hxx @@ -45,7 +45,7 @@ class CartridgeE7 : public CartridgeMNetwork */ CartridgeE7(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeE7() = default; + ~CartridgeE7() override = default; public: /** diff --git a/src/emucore/CartE78K.hxx b/src/emucore/CartE78K.hxx index d25e9f889..cc23e1feb 100644 --- a/src/emucore/CartE78K.hxx +++ b/src/emucore/CartE78K.hxx @@ -43,7 +43,7 @@ class CartridgeE78K : public CartridgeMNetwork */ CartridgeE78K(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeE78K() = default; + ~CartridgeE78K() override = default; public: /** diff --git a/src/emucore/CartEF.hxx b/src/emucore/CartEF.hxx index 2c86d0d71..0ec1bf741 100644 --- a/src/emucore/CartEF.hxx +++ b/src/emucore/CartEF.hxx @@ -49,7 +49,7 @@ class CartridgeEF : public CartridgeEnhanced */ CartridgeEF(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 64_KB); - virtual ~CartridgeEF() = default; + ~CartridgeEF() override = default; public: /** diff --git a/src/emucore/CartEFSC.hxx b/src/emucore/CartEFSC.hxx index ac95c9e2c..661dbaa8f 100644 --- a/src/emucore/CartEFSC.hxx +++ b/src/emucore/CartEFSC.hxx @@ -50,7 +50,7 @@ class CartridgeEFSC : public CartridgeEF */ CartridgeEFSC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 64_KB); - virtual ~CartridgeEFSC() = default; + ~CartridgeEFSC() override = default; public: /** diff --git a/src/emucore/CartEnhanced.hxx b/src/emucore/CartEnhanced.hxx index e99afc917..98fb8e910 100644 --- a/src/emucore/CartEnhanced.hxx +++ b/src/emucore/CartEnhanced.hxx @@ -48,7 +48,7 @@ class CartridgeEnhanced : public Cartridge CartridgeEnhanced(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize); - virtual ~CartridgeEnhanced() = default; + ~CartridgeEnhanced() override = default; public: /** diff --git a/src/emucore/CartF0.hxx b/src/emucore/CartF0.hxx index e49b8ce31..2f287b5f2 100644 --- a/src/emucore/CartF0.hxx +++ b/src/emucore/CartF0.hxx @@ -46,7 +46,7 @@ class CartridgeF0 : public CartridgeEnhanced */ CartridgeF0(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 64_KB); - virtual ~CartridgeF0() = default; + ~CartridgeF0() override = default; public: /** diff --git a/src/emucore/CartF4.hxx b/src/emucore/CartF4.hxx index 81a5e176e..7da18159f 100644 --- a/src/emucore/CartF4.hxx +++ b/src/emucore/CartF4.hxx @@ -45,7 +45,7 @@ class CartridgeF4 : public CartridgeEnhanced */ CartridgeF4(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 32_KB); - virtual ~CartridgeF4() = default; + ~CartridgeF4() override = default; public: /** diff --git a/src/emucore/CartF4SC.hxx b/src/emucore/CartF4SC.hxx index 49f1278ac..1cdd2865c 100644 --- a/src/emucore/CartF4SC.hxx +++ b/src/emucore/CartF4SC.hxx @@ -46,7 +46,7 @@ class CartridgeF4SC : public CartridgeF4 */ CartridgeF4SC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 32_KB); - virtual ~CartridgeF4SC() = default; + ~CartridgeF4SC() override = default; public: /** diff --git a/src/emucore/CartF6.hxx b/src/emucore/CartF6.hxx index 7707f1ef6..7e04a8521 100644 --- a/src/emucore/CartF6.hxx +++ b/src/emucore/CartF6.hxx @@ -45,7 +45,7 @@ class CartridgeF6 : public CartridgeEnhanced */ CartridgeF6(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 16_KB); - virtual ~CartridgeF6() = default; + ~CartridgeF6() override = default; public: /** diff --git a/src/emucore/CartF6SC.hxx b/src/emucore/CartF6SC.hxx index 4365036bb..f7a4ac59e 100644 --- a/src/emucore/CartF6SC.hxx +++ b/src/emucore/CartF6SC.hxx @@ -46,7 +46,7 @@ class CartridgeF6SC : public CartridgeF6 */ CartridgeF6SC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 16_KB); - virtual ~CartridgeF6SC() = default; + ~CartridgeF6SC() override = default; public: /** diff --git a/src/emucore/CartF8.hxx b/src/emucore/CartF8.hxx index 90b34497a..78110f95a 100644 --- a/src/emucore/CartF8.hxx +++ b/src/emucore/CartF8.hxx @@ -45,7 +45,7 @@ class CartridgeF8 : public CartridgeEnhanced */ CartridgeF8(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~CartridgeF8() = default; + ~CartridgeF8() override = default; public: /** diff --git a/src/emucore/CartF8SC.hxx b/src/emucore/CartF8SC.hxx index 3eb3539ae..7f0fdd1c7 100644 --- a/src/emucore/CartF8SC.hxx +++ b/src/emucore/CartF8SC.hxx @@ -46,7 +46,7 @@ class CartridgeF8SC : public CartridgeF8 */ CartridgeF8SC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~CartridgeF8SC() = default; + ~CartridgeF8SC() override = default; public: /** diff --git a/src/emucore/CartFA.hxx b/src/emucore/CartFA.hxx index d234de743..a8d23ebce 100644 --- a/src/emucore/CartFA.hxx +++ b/src/emucore/CartFA.hxx @@ -49,7 +49,7 @@ class CartridgeFA : public CartridgeEnhanced */ CartridgeFA(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 12_KB); - virtual ~CartridgeFA() = default; + ~CartridgeFA() override = default; public: /** diff --git a/src/emucore/CartFA2.hxx b/src/emucore/CartFA2.hxx index ea60fbe45..a7c5aa03a 100644 --- a/src/emucore/CartFA2.hxx +++ b/src/emucore/CartFA2.hxx @@ -61,7 +61,7 @@ class CartridgeFA2 : public CartridgeFA */ CartridgeFA2(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 28_KB); - virtual ~CartridgeFA2() = default; + ~CartridgeFA2() override = default; public: /** diff --git a/src/emucore/CartFC.hxx b/src/emucore/CartFC.hxx index 92be2a421..3a478c597 100644 --- a/src/emucore/CartFC.hxx +++ b/src/emucore/CartFC.hxx @@ -52,7 +52,7 @@ class CartridgeFC : public CartridgeEnhanced */ CartridgeFC(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~CartridgeFC() = default; + ~CartridgeFC() override = default; public: /** diff --git a/src/emucore/CartFE.hxx b/src/emucore/CartFE.hxx index 77ebee767..8f5d75e8d 100644 --- a/src/emucore/CartFE.hxx +++ b/src/emucore/CartFE.hxx @@ -91,7 +91,7 @@ class CartridgeFE : public CartridgeEnhanced */ CartridgeFE(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~CartridgeFE() = default; + ~CartridgeFE() override = default; public: /** diff --git a/src/emucore/CartMDM.hxx b/src/emucore/CartMDM.hxx index 4e12571e1..715738977 100644 --- a/src/emucore/CartMDM.hxx +++ b/src/emucore/CartMDM.hxx @@ -61,7 +61,7 @@ class CartridgeMDM : public CartridgeEnhanced */ CartridgeMDM(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~CartridgeMDM() = default; + ~CartridgeMDM() override = default; public: /** diff --git a/src/emucore/CartMNetwork.hxx b/src/emucore/CartMNetwork.hxx index 9b17a4b67..64bfd0e6b 100644 --- a/src/emucore/CartMNetwork.hxx +++ b/src/emucore/CartMNetwork.hxx @@ -75,7 +75,7 @@ class CartridgeMNetwork : public Cartridge */ CartridgeMNetwork(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings); - virtual ~CartridgeMNetwork() = default; + ~CartridgeMNetwork() override = default; public: /** diff --git a/src/emucore/CartSB.hxx b/src/emucore/CartSB.hxx index 17cea387c..5e2c7ffa4 100644 --- a/src/emucore/CartSB.hxx +++ b/src/emucore/CartSB.hxx @@ -50,7 +50,7 @@ class CartridgeSB : public CartridgeEnhanced */ CartridgeSB(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 0); - virtual ~CartridgeSB() = default; + ~CartridgeSB() override = default; public: /** diff --git a/src/emucore/CartTVBoy.hxx b/src/emucore/CartTVBoy.hxx index d1787e55b..117f84f68 100644 --- a/src/emucore/CartTVBoy.hxx +++ b/src/emucore/CartTVBoy.hxx @@ -48,7 +48,7 @@ class CartridgeTVBoy : public CartridgeEnhanced */ CartridgeTVBoy(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 512_KB); - virtual ~CartridgeTVBoy() = default; + ~CartridgeTVBoy() override = default; public: /** diff --git a/src/emucore/CartUA.hxx b/src/emucore/CartUA.hxx index 77b83d10b..95d4d022d 100644 --- a/src/emucore/CartUA.hxx +++ b/src/emucore/CartUA.hxx @@ -48,7 +48,7 @@ class CartridgeUA : public CartridgeEnhanced */ CartridgeUA(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, bool swapHotspots = false); - virtual ~CartridgeUA() = default; + ~CartridgeUA() override = default; public: /** diff --git a/src/emucore/CartWD.hxx b/src/emucore/CartWD.hxx index 4c1d9d3d9..de4cbd68d 100644 --- a/src/emucore/CartWD.hxx +++ b/src/emucore/CartWD.hxx @@ -69,7 +69,7 @@ class CartridgeWD : public CartridgeEnhanced */ CartridgeWD(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 8_KB); - virtual ~CartridgeWD() = default; + ~CartridgeWD() override = default; public: /** diff --git a/src/emucore/CartX07.hxx b/src/emucore/CartX07.hxx index 3f59ca7c3..65dd83f41 100644 --- a/src/emucore/CartX07.hxx +++ b/src/emucore/CartX07.hxx @@ -58,7 +58,7 @@ class CartridgeX07 : public CartridgeEnhanced */ CartridgeX07(const ByteBuffer& image, size_t size, const string& md5, const Settings& settings, size_t bsSize = 64_KB); - virtual ~CartridgeX07() = default; + ~CartridgeX07() override = default; public: /** diff --git a/src/emucore/CompuMate.hxx b/src/emucore/CompuMate.hxx index 8b8d772e8..e9a9a047e 100644 --- a/src/emucore/CompuMate.hxx +++ b/src/emucore/CompuMate.hxx @@ -52,7 +52,6 @@ class CompuMate @param system The system using this controller */ CompuMate(const Console& console, const Event& event, const System& system); - virtual ~CompuMate() = default; // Controllers are deleted outside this class /** Return the left and right CompuMate controllers @@ -88,7 +87,7 @@ class CompuMate const System& system) : Controller(jack, event, system, Controller::Type::CompuMate), myHandler(handler) { } - virtual ~CMControl() = default; + ~CMControl() override = default; public: /** diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx index 366e606a0..78f14ba20 100644 --- a/src/emucore/Console.hxx +++ b/src/emucore/Console.hxx @@ -78,7 +78,7 @@ class Console : public Serializable, public ConsoleIO /** Destructor */ - virtual ~Console(); + ~Console() override; public: diff --git a/src/emucore/Control.hxx b/src/emucore/Control.hxx index 128912dcd..629a2afee 100644 --- a/src/emucore/Control.hxx +++ b/src/emucore/Control.hxx @@ -119,7 +119,7 @@ class Controller : public Serializable */ Controller(Jack jack, const Event& event, const System& system, Type type); - virtual ~Controller() = default; + ~Controller() override = default; /** Returns the jack that this controller is plugged into. diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx index fb2423a35..c690e0ab2 100644 --- a/src/emucore/Device.hxx +++ b/src/emucore/Device.hxx @@ -67,7 +67,7 @@ class Device : public Serializable public: Device() = default; - virtual ~Device() = default; + ~Device() override = default; public: /** diff --git a/src/emucore/Driving.hxx b/src/emucore/Driving.hxx index 6d0adaea8..35a02b2c1 100644 --- a/src/emucore/Driving.hxx +++ b/src/emucore/Driving.hxx @@ -38,7 +38,7 @@ class Driving : public Controller @param system The system using this controller */ Driving(Jack jack, const Event& event, const System& system); - virtual ~Driving() = default; + ~Driving() override = default; public: /** diff --git a/src/emucore/Genesis.hxx b/src/emucore/Genesis.hxx index fb0f65c20..3500cfbde 100644 --- a/src/emucore/Genesis.hxx +++ b/src/emucore/Genesis.hxx @@ -41,7 +41,7 @@ class Genesis : public Controller @param system The system using this controller */ Genesis(Jack jack, const Event& event, const System& system); - virtual ~Genesis() = default; + ~Genesis() override = default; public: /** diff --git a/src/emucore/Joystick.hxx b/src/emucore/Joystick.hxx index 505294456..99675c51e 100644 --- a/src/emucore/Joystick.hxx +++ b/src/emucore/Joystick.hxx @@ -38,7 +38,7 @@ class Joystick : public Controller @param system The system using this controller */ Joystick(Jack jack, const Event& event, const System& system); - virtual ~Joystick() = default; + ~Joystick() override = default; public: /** diff --git a/src/emucore/Keyboard.hxx b/src/emucore/Keyboard.hxx index 9ec176d71..3f6a714e5 100644 --- a/src/emucore/Keyboard.hxx +++ b/src/emucore/Keyboard.hxx @@ -38,7 +38,7 @@ class Keyboard : public Controller @param system The system using this controller */ Keyboard(Jack jack, const Event& event, const System& system); - virtual ~Keyboard() = default; + ~Keyboard() override = default; public: /** diff --git a/src/emucore/KidVid.hxx b/src/emucore/KidVid.hxx index 4c23761a1..b62107622 100644 --- a/src/emucore/KidVid.hxx +++ b/src/emucore/KidVid.hxx @@ -49,7 +49,7 @@ class KidVid : public Controller */ KidVid(Jack jack, const Event& event, const System& system, const string& romMd5); - virtual ~KidVid(); + ~KidVid() override; public: /** diff --git a/src/emucore/Lightgun.hxx b/src/emucore/Lightgun.hxx index facdffe1e..11a4c2e5b 100644 --- a/src/emucore/Lightgun.hxx +++ b/src/emucore/Lightgun.hxx @@ -44,7 +44,7 @@ class Lightgun : public Controller */ Lightgun(Jack jack, const Event& event, const System& system, const string& romMd5, const FrameBuffer& frameBuffer); - virtual ~Lightgun() = default; + ~Lightgun() override = default; public: using Controller::read; diff --git a/src/emucore/M6502.hxx b/src/emucore/M6502.hxx index 6cb3ccc65..6895025ac 100644 --- a/src/emucore/M6502.hxx +++ b/src/emucore/M6502.hxx @@ -64,7 +64,7 @@ class M6502 : public Serializable Create a new 6502 microprocessor. */ explicit M6502(const Settings& settings); - virtual ~M6502() = default; + ~M6502() override = default; public: /** diff --git a/src/emucore/M6532.hxx b/src/emucore/M6532.hxx index 6e7408798..d35877ab8 100644 --- a/src/emucore/M6532.hxx +++ b/src/emucore/M6532.hxx @@ -52,7 +52,7 @@ class M6532 : public Device @param settings The settings used by the system */ M6532(const ConsoleIO& console, const Settings& settings); - virtual ~M6532() = default; + ~M6532() override = default; public: /** diff --git a/src/emucore/MindLink.hxx b/src/emucore/MindLink.hxx index c1c2fbcf7..a205a61da 100644 --- a/src/emucore/MindLink.hxx +++ b/src/emucore/MindLink.hxx @@ -48,7 +48,7 @@ class MindLink : public Controller @param system The system using this controller */ MindLink(Jack jack, const Event& event, const System& system); - virtual ~MindLink() = default; + ~MindLink() override = default; public: /** diff --git a/src/emucore/NullDev.hxx b/src/emucore/NullDev.hxx index 7ef3b24b0..798edd64b 100644 --- a/src/emucore/NullDev.hxx +++ b/src/emucore/NullDev.hxx @@ -34,7 +34,7 @@ class NullDevice : public Device { public: NullDevice() = default; - virtual ~NullDevice() = default; + ~NullDevice() override = default; public: /** diff --git a/src/emucore/Paddles.hxx b/src/emucore/Paddles.hxx index bb8144b21..a84bf813c 100644 --- a/src/emucore/Paddles.hxx +++ b/src/emucore/Paddles.hxx @@ -45,7 +45,7 @@ class Paddles : public Controller */ Paddles(Jack jack, const Event& event, const System& system, bool swappaddle, bool swapaxis, bool swapdir); - virtual ~Paddles() = default; + ~Paddles() override = default; public: static constexpr float BASE_ANALOG_SENSE = 0.148643628F; diff --git a/src/emucore/PointingDevice.hxx b/src/emucore/PointingDevice.hxx index 11b9fcd2d..105d07f43 100644 --- a/src/emucore/PointingDevice.hxx +++ b/src/emucore/PointingDevice.hxx @@ -37,7 +37,7 @@ class PointingDevice : public Controller PointingDevice(Jack jack, const Event& event, const System& system, Controller::Type type, float sensitivity); - virtual ~PointingDevice() = default; + ~PointingDevice() override = default; public: using Controller::read; diff --git a/src/emucore/SaveKey.hxx b/src/emucore/SaveKey.hxx index ce5c3e347..79b8c25a3 100644 --- a/src/emucore/SaveKey.hxx +++ b/src/emucore/SaveKey.hxx @@ -47,7 +47,7 @@ class SaveKey : public Controller */ SaveKey(Jack jack, const Event& event, const System& system, const FilesystemNode& eepromfile, const onMessageCallback& callback); - virtual ~SaveKey(); + ~SaveKey() override; protected: /** diff --git a/src/emucore/Switches.hxx b/src/emucore/Switches.hxx index 16c4dba74..19fc47069 100644 --- a/src/emucore/Switches.hxx +++ b/src/emucore/Switches.hxx @@ -47,7 +47,7 @@ class Switches : public Serializable @param settings The settings used by the system */ Switches(const Event& event, const Properties& props, const Settings& settings); - virtual ~Switches() = default; + ~Switches() override = default; public: /** diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx index b0660fec7..cf483c342 100644 --- a/src/emucore/System.hxx +++ b/src/emucore/System.hxx @@ -50,7 +50,7 @@ class System : public Serializable */ System(Random& random, M6502& m6502, M6532& m6532, TIA& mTIA, Cartridge& mCart); - virtual ~System() = default; + ~System() override = default; // Mask to apply to an address before accessing memory static constexpr uInt16 ADDRESS_MASK = (1 << 13) - 1; diff --git a/src/emucore/TrakBall.hxx b/src/emucore/TrakBall.hxx index 9e5a86234..7691543db 100644 --- a/src/emucore/TrakBall.hxx +++ b/src/emucore/TrakBall.hxx @@ -33,7 +33,7 @@ class TrakBall : public PointingDevice TrakBall(Jack jack, const Event& event, const System& system) : PointingDevice(jack, event, system, Controller::Type::TrakBall, trackballSensitivity) { } - virtual ~TrakBall() = default; + ~TrakBall() override = default; /** Returns the name of this controller. diff --git a/src/emucore/tia/TIA.hxx b/src/emucore/tia/TIA.hxx index 3b2cbea7c..608caf184 100644 --- a/src/emucore/tia/TIA.hxx +++ b/src/emucore/tia/TIA.hxx @@ -117,7 +117,7 @@ class TIA : public Device */ TIA(ConsoleIO& console, const ConsoleTimingProvider& timingProvider, Settings& settings); - virtual ~TIA() = default; + ~TIA() override = default; public: /** diff --git a/src/gui/AboutDialog.hxx b/src/gui/AboutDialog.hxx index fd3ad0a4c..6ae420537 100644 --- a/src/gui/AboutDialog.hxx +++ b/src/gui/AboutDialog.hxx @@ -32,7 +32,7 @@ class AboutDialog : public Dialog public: AboutDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - virtual ~AboutDialog(); + ~AboutDialog() override; private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/BrowserDialog.hxx b/src/gui/BrowserDialog.hxx index 066b103c8..253e183b7 100644 --- a/src/gui/BrowserDialog.hxx +++ b/src/gui/BrowserDialog.hxx @@ -41,7 +41,7 @@ class BrowserDialog : public Dialog, public CommandSender public: BrowserDialog(GuiObject* boss, const GUI::Font& font, int max_w, int max_h, const string& title = ""); - virtual ~BrowserDialog() = default; + ~BrowserDialog() override = default; /** Place the browser window onscreen, using the given attributes */ void show(const string& startpath, diff --git a/src/gui/CheckListWidget.hxx b/src/gui/CheckListWidget.hxx index 517e87e2b..625875a9d 100644 --- a/src/gui/CheckListWidget.hxx +++ b/src/gui/CheckListWidget.hxx @@ -34,7 +34,7 @@ class CheckListWidget : public ListWidget public: CheckListWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~CheckListWidget() = default; + ~CheckListWidget() override = default; void setList(const StringList& list, const BoolArray& state); void setLine(int line, const string& str, const bool& state); diff --git a/src/gui/ColorWidget.hxx b/src/gui/ColorWidget.hxx index 9169c2153..4d39871fa 100644 --- a/src/gui/ColorWidget.hxx +++ b/src/gui/ColorWidget.hxx @@ -37,7 +37,7 @@ class ColorWidget : public Widget, public CommandSender public: ColorWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, int cmd = 0, bool framed = true); - virtual ~ColorWidget() = default; + ~ColorWidget() override = default; void setColor(ColorId color); ColorId getColor() const { return _color; } diff --git a/src/gui/ComboDialog.hxx b/src/gui/ComboDialog.hxx index 7a539796d..5e57e8ae2 100644 --- a/src/gui/ComboDialog.hxx +++ b/src/gui/ComboDialog.hxx @@ -30,7 +30,7 @@ class ComboDialog : public Dialog { public: ComboDialog(GuiObject* boss, const GUI::Font& font, const VariantList& combolist); - virtual ~ComboDialog() = default; + ~ComboDialog() override = default; /** Place the dialog onscreen and center it */ void show(Event::Type event, const string& name); diff --git a/src/gui/CommandDialog.hxx b/src/gui/CommandDialog.hxx index bd366fc08..3cfaf7576 100644 --- a/src/gui/CommandDialog.hxx +++ b/src/gui/CommandDialog.hxx @@ -29,7 +29,7 @@ class CommandDialog : public Dialog { public: CommandDialog(OSystem& osystem, DialogContainer& parent); - virtual ~CommandDialog() = default; + ~CommandDialog() override = default; protected: void loadConfig() override; diff --git a/src/gui/CommandMenu.hxx b/src/gui/CommandMenu.hxx index 2873e9213..0a09ea140 100644 --- a/src/gui/CommandMenu.hxx +++ b/src/gui/CommandMenu.hxx @@ -35,7 +35,7 @@ class CommandMenu : public DialogContainer Create a new menu stack */ explicit CommandMenu(OSystem& osystem); - virtual ~CommandMenu(); + ~CommandMenu() override; /** Return (and possibly create) the bottom-most dialog of this container. diff --git a/src/gui/ContextMenu.hxx b/src/gui/ContextMenu.hxx index 221b90a30..423ef3074 100644 --- a/src/gui/ContextMenu.hxx +++ b/src/gui/ContextMenu.hxx @@ -43,7 +43,7 @@ class ContextMenu : public Dialog, public CommandSender public: ContextMenu(GuiObject* boss, const GUI::Font& font, const VariantList& items, int cmd = 0, int width = 0); - virtual ~ContextMenu() = default; + ~ContextMenu() override = default; /** Set the parent widget's ID */ void setID(uInt32 id) { _id = id; } diff --git a/src/gui/DeveloperDialog.hxx b/src/gui/DeveloperDialog.hxx index 8dd2dc4e2..c2e88828b 100644 --- a/src/gui/DeveloperDialog.hxx +++ b/src/gui/DeveloperDialog.hxx @@ -42,7 +42,7 @@ class DeveloperDialog : public Dialog public: DeveloperDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~DeveloperDialog() = default; + ~DeveloperDialog() override = default; private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/Dialog.hxx b/src/gui/Dialog.hxx index 3c0242e9c..1f6bbec60 100644 --- a/src/gui/Dialog.hxx +++ b/src/gui/Dialog.hxx @@ -48,8 +48,7 @@ class Dialog : public GuiObject int x = 0, int y = 0, int w = 0, int h = 0); Dialog(OSystem& instance, DialogContainer& parent, const GUI::Font& font, const string& title = "", int x = 0, int y = 0, int w = 0, int h = 0); - - virtual ~Dialog(); + ~Dialog() override; void open(); void close(); @@ -212,10 +211,6 @@ class Dialog : public GuiObject WidgetArray list; explicit Focus(Widget* w = nullptr) : widget(w) { } - virtual ~Focus() = default; - - Focus(const Focus&) = default; - Focus& operator=(const Focus&) = default; }; using FocusList = vector; @@ -225,10 +220,6 @@ class Dialog : public GuiObject uInt32 currentTab{0}; explicit TabFocus(TabWidget* w = nullptr) : widget(w) { } - virtual ~TabFocus() = default; - - TabFocus(const TabFocus&) = default; - TabFocus& operator=(const TabFocus&) = default; void appendFocusList(WidgetArray& list); void saveCurrentFocus(Widget* w); diff --git a/src/gui/EditTextWidget.hxx b/src/gui/EditTextWidget.hxx index c7a346804..fe063e042 100644 --- a/src/gui/EditTextWidget.hxx +++ b/src/gui/EditTextWidget.hxx @@ -27,7 +27,7 @@ class EditTextWidget : public EditableWidget public: EditTextWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, const string& text = ""); - virtual ~EditTextWidget() = default; + ~EditTextWidget() override = default; void setText(const string& str, bool changed = false) override; diff --git a/src/gui/EditableWidget.hxx b/src/gui/EditableWidget.hxx index 3167e5d34..933d033af 100644 --- a/src/gui/EditableWidget.hxx +++ b/src/gui/EditableWidget.hxx @@ -46,7 +46,7 @@ class EditableWidget : public Widget, public CommandSender public: EditableWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, const string& str = ""); - virtual ~EditableWidget() = default; + ~EditableWidget() override = default; virtual void setText(const string& str, bool changed = false); const string& getText() const { return _editString; } diff --git a/src/gui/EmulationDialog.hxx b/src/gui/EmulationDialog.hxx index f1470d7bb..a03d27a70 100644 --- a/src/gui/EmulationDialog.hxx +++ b/src/gui/EmulationDialog.hxx @@ -24,40 +24,40 @@ class RadioButtonGroup; class EmulationDialog : public Dialog { -public: - EmulationDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, - int max_w, int max_h); - virtual ~EmulationDialog() = default; + public: + EmulationDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, + int max_w, int max_h); + ~EmulationDialog() override = default; -private: - void loadConfig() override; - void saveConfig() override; - void setDefaults() override; + private: + void loadConfig() override; + void saveConfig() override; + void setDefaults() override; - void handleCommand(CommandSender* sender, int cmd, int data, int id) override; + void handleCommand(CommandSender* sender, int cmd, int data, int id) override; -private: - SliderWidget* mySpeed{nullptr}; - CheckboxWidget* myUseVSync{nullptr}; - CheckboxWidget* myTurbo{nullptr}; - CheckboxWidget* myUIMessages{nullptr}; - CheckboxWidget* myFastSCBios{nullptr}; - CheckboxWidget* myUseThreads{nullptr}; - CheckboxWidget* myConfirmExitWidget{nullptr}; - RadioButtonGroup* mySaveOnExitGroup{nullptr}; - CheckboxWidget* myAutoSlotWidget{nullptr}; + private: + SliderWidget* mySpeed{nullptr}; + CheckboxWidget* myUseVSync{nullptr}; + CheckboxWidget* myTurbo{nullptr}; + CheckboxWidget* myUIMessages{nullptr}; + CheckboxWidget* myFastSCBios{nullptr}; + CheckboxWidget* myUseThreads{nullptr}; + CheckboxWidget* myConfirmExitWidget{nullptr}; + RadioButtonGroup* mySaveOnExitGroup{nullptr}; + CheckboxWidget* myAutoSlotWidget{nullptr}; - enum { - kSpeedupChanged = 'EDSp', - }; + enum { + kSpeedupChanged = 'EDSp', + }; -private: - // Following constructors and assignment operators not supported - EmulationDialog() = delete; - EmulationDialog(const EmulationDialog&) = delete; - EmulationDialog(EmulationDialog&&) = delete; - EmulationDialog& operator=(const EmulationDialog&) = delete; - EmulationDialog& operator=(EmulationDialog&&) = delete; + private: + // Following constructors and assignment operators not supported + EmulationDialog() = delete; + EmulationDialog(const EmulationDialog&) = delete; + EmulationDialog(EmulationDialog&&) = delete; + EmulationDialog& operator=(const EmulationDialog&) = delete; + EmulationDialog& operator=(EmulationDialog&&) = delete; }; #endif diff --git a/src/gui/EventMappingWidget.hxx b/src/gui/EventMappingWidget.hxx index 901f1ca70..074f87e6e 100644 --- a/src/gui/EventMappingWidget.hxx +++ b/src/gui/EventMappingWidget.hxx @@ -41,7 +41,7 @@ class EventMappingWidget : public Widget, public CommandSender EventMappingWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, EventMode mode); - virtual ~EventMappingWidget() = default; + ~EventMappingWidget() override = default; bool remapMode() { return myRemapStatus; } diff --git a/src/gui/FileListWidget.hxx b/src/gui/FileListWidget.hxx index 552331b29..2bcc64048 100644 --- a/src/gui/FileListWidget.hxx +++ b/src/gui/FileListWidget.hxx @@ -50,7 +50,7 @@ class FileListWidget : public StringListWidget public: FileListWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~FileListWidget() = default; + ~FileListWidget() override = default; /** Determines how to display files/folders; either setDirectory or reload must be called after any of these are called. */ diff --git a/src/gui/GameInfoDialog.hxx b/src/gui/GameInfoDialog.hxx index 7e5febdde..c1302e753 100644 --- a/src/gui/GameInfoDialog.hxx +++ b/src/gui/GameInfoDialog.hxx @@ -36,7 +36,7 @@ class GameInfoDialog : public Dialog, public CommandSender public: GameInfoDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, GuiObject* boss, int max_w, int max_h); - virtual ~GameInfoDialog() = default; + ~GameInfoDialog() override = default; private: void loadConfig() override; diff --git a/src/gui/GlobalPropsDialog.hxx b/src/gui/GlobalPropsDialog.hxx index 2babd01fe..b63a771e1 100644 --- a/src/gui/GlobalPropsDialog.hxx +++ b/src/gui/GlobalPropsDialog.hxx @@ -31,7 +31,7 @@ class GlobalPropsDialog : public Dialog, public CommandSender { public: GlobalPropsDialog(GuiObject* boss, const GUI::Font& font); - virtual ~GlobalPropsDialog() = default; + ~GlobalPropsDialog() override = default; private: int addHoldWidgets(const GUI::Font& font, int x, int y, WidgetArray& wid); diff --git a/src/gui/GuiObject.hxx b/src/gui/GuiObject.hxx index fc8f77285..77392209c 100644 --- a/src/gui/GuiObject.hxx +++ b/src/gui/GuiObject.hxx @@ -60,7 +60,7 @@ class GuiObject : public CommandReceiver myDialog(dialog), _x(x), _y(y), _w(w), _h(h) { } - virtual ~GuiObject() = default; + ~GuiObject() override = default; OSystem& instance() const { return myOSystem; } DialogContainer& parent() const { return myParent; } diff --git a/src/gui/HelpDialog.hxx b/src/gui/HelpDialog.hxx index 352824f0d..1d44edb30 100644 --- a/src/gui/HelpDialog.hxx +++ b/src/gui/HelpDialog.hxx @@ -31,7 +31,7 @@ class HelpDialog : public Dialog { public: HelpDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - virtual ~HelpDialog() = default; + ~HelpDialog() override = default; private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/InputDialog.hxx b/src/gui/InputDialog.hxx index 6893d2c43..6cb6c4742 100644 --- a/src/gui/InputDialog.hxx +++ b/src/gui/InputDialog.hxx @@ -40,7 +40,7 @@ class InputDialog : public Dialog public: InputDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~InputDialog(); + ~InputDialog() override; protected: // disable repeat during and directly after mapping events diff --git a/src/gui/InputTextDialog.hxx b/src/gui/InputTextDialog.hxx index d48d10a45..e89e00651 100644 --- a/src/gui/InputTextDialog.hxx +++ b/src/gui/InputTextDialog.hxx @@ -34,7 +34,7 @@ class InputTextDialog : public Dialog, public CommandSender InputTextDialog(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont, const StringList& labels, const string& title = ""); - virtual ~InputTextDialog() = default; + ~InputTextDialog() override = default; /** Place the input dialog onscreen and center it */ void show(); diff --git a/src/gui/JoystickDialog.hxx b/src/gui/JoystickDialog.hxx index 7221763f1..67074d1d2 100644 --- a/src/gui/JoystickDialog.hxx +++ b/src/gui/JoystickDialog.hxx @@ -35,7 +35,7 @@ class JoystickDialog : public Dialog public: JoystickDialog(GuiObject* boss, const GUI::Font& font, int max_w, int max_h); - virtual ~JoystickDialog() = default; + ~JoystickDialog() override = default; /** Place the dialog onscreen and center it */ void show() { open(); } diff --git a/src/gui/Launcher.hxx b/src/gui/Launcher.hxx index af0e91f8b..4148db945 100644 --- a/src/gui/Launcher.hxx +++ b/src/gui/Launcher.hxx @@ -37,7 +37,7 @@ class Launcher : public DialogContainer Create a new menu stack */ explicit Launcher(OSystem& osystem); - virtual ~Launcher(); + ~Launcher() override; /** Initialize the video subsystem wrt this class. diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx index 0f1f1cda2..0dd9b898d 100644 --- a/src/gui/LauncherDialog.hxx +++ b/src/gui/LauncherDialog.hxx @@ -58,7 +58,7 @@ class LauncherDialog : public Dialog public: LauncherDialog(OSystem& osystem, DialogContainer& parent, int x, int y, int w, int h); - virtual ~LauncherDialog() = default; + ~LauncherDialog() override = default; /** Get path for the currently selected file. diff --git a/src/gui/ListWidget.hxx b/src/gui/ListWidget.hxx index b60c7dc9a..75d2600ae 100644 --- a/src/gui/ListWidget.hxx +++ b/src/gui/ListWidget.hxx @@ -43,7 +43,7 @@ class ListWidget : public EditableWidget public: ListWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~ListWidget() = default; + ~ListWidget() override = default; int rows() const { return _rows; } int currentPos() const { return _currentPos; } diff --git a/src/gui/LoggerDialog.hxx b/src/gui/LoggerDialog.hxx index 9ab22d769..2f5188343 100644 --- a/src/gui/LoggerDialog.hxx +++ b/src/gui/LoggerDialog.hxx @@ -32,7 +32,7 @@ class LoggerDialog : public Dialog LoggerDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h, bool useLargeFont = true); - virtual ~LoggerDialog() = default; + ~LoggerDialog() override = default; private: void loadConfig() override; diff --git a/src/gui/Menu.hxx b/src/gui/Menu.hxx index ead0b9065..cb6acf30c 100644 --- a/src/gui/Menu.hxx +++ b/src/gui/Menu.hxx @@ -39,7 +39,7 @@ class Menu : public DialogContainer Create a new menu stack */ explicit Menu(OSystem& osystem); - virtual ~Menu(); + ~Menu() override; private: Dialog* baseDialog() override; diff --git a/src/gui/MessageBox.hxx b/src/gui/MessageBox.hxx index c6b1934aa..4ed74fa58 100644 --- a/src/gui/MessageBox.hxx +++ b/src/gui/MessageBox.hxx @@ -54,7 +54,7 @@ class MessageBox : public Dialog, public CommandSender const string& okText = "OK", const string& cancelText = "Cancel", const string& title = "", bool focusOKButton = true); - virtual ~MessageBox() = default; + ~MessageBox() override = default; /** Place the input dialog onscreen and center it */ void show() { open(); } diff --git a/src/gui/MessageDialog.hxx b/src/gui/MessageDialog.hxx index 4ebb6607a..7e0928ced 100644 --- a/src/gui/MessageDialog.hxx +++ b/src/gui/MessageDialog.hxx @@ -30,7 +30,7 @@ class MessageDialog : public Dialog public: MessageDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~MessageDialog(); + ~MessageDialog() override; // Define the message displayed void setMessage(const string& title, const string& text, bool yesNo = false); diff --git a/src/gui/MessageMenu.hxx b/src/gui/MessageMenu.hxx index e5246e5ae..cfe114e76 100644 --- a/src/gui/MessageMenu.hxx +++ b/src/gui/MessageMenu.hxx @@ -30,28 +30,28 @@ class MessageDialog; */ class MessageMenu : public DialogContainer { -public: - /** - Create a new menu stack - */ - explicit MessageMenu(OSystem& osystem); - virtual ~MessageMenu(); + public: + /** + Create a new menu stack + */ + explicit MessageMenu(OSystem& osystem); + ~MessageMenu() override; - void setMessage(const string& title, const string& text, bool yesNo = false); - void setMessage(const string& title, const StringList& text, bool yesNo = false); - bool confirmed(); + void setMessage(const string& title, const string& text, bool yesNo = false); + void setMessage(const string& title, const StringList& text, bool yesNo = false); + bool confirmed(); -private: - Dialog* baseDialog() override; - MessageDialog* myMessageDialog{nullptr}; + private: + Dialog* baseDialog() override; + MessageDialog* myMessageDialog{nullptr}; -private: - // Following constructors and assignment operators not supported - MessageMenu() = delete; - MessageMenu(const MessageMenu&) = delete; - MessageMenu(MessageMenu&&) = delete; - MessageMenu& operator=(const MessageMenu&) = delete; - MessageMenu& operator=(MessageMenu&&) = delete; + private: + // Following constructors and assignment operators not supported + MessageMenu() = delete; + MessageMenu(const MessageMenu&) = delete; + MessageMenu(MessageMenu&&) = delete; + MessageMenu& operator=(const MessageMenu&) = delete; + MessageMenu& operator=(MessageMenu&&) = delete; }; #endif diff --git a/src/gui/MinUICommandDialog.hxx b/src/gui/MinUICommandDialog.hxx index 76f69ba6c..e56ca8457 100644 --- a/src/gui/MinUICommandDialog.hxx +++ b/src/gui/MinUICommandDialog.hxx @@ -31,7 +31,7 @@ class MinUICommandDialog : public Dialog { public: MinUICommandDialog(OSystem& osystem, DialogContainer& parent); - virtual ~MinUICommandDialog() = default; + ~MinUICommandDialog() override = default; protected: void loadConfig() override; diff --git a/src/gui/OptionsDialog.hxx b/src/gui/OptionsDialog.hxx index 001fad73b..55d4d4b0d 100644 --- a/src/gui/OptionsDialog.hxx +++ b/src/gui/OptionsDialog.hxx @@ -45,7 +45,7 @@ class OptionsDialog : public Dialog public: OptionsDialog(OSystem& osystem, DialogContainer& parent, GuiObject* boss, int max_w, int max_h, Menu::AppMode mode); - virtual ~OptionsDialog(); + ~OptionsDialog() override; private: void loadConfig() override; diff --git a/src/gui/PopUpWidget.hxx b/src/gui/PopUpWidget.hxx index c9817e6dd..a3c122509 100644 --- a/src/gui/PopUpWidget.hxx +++ b/src/gui/PopUpWidget.hxx @@ -39,7 +39,7 @@ class PopUpWidget : public Widget, public CommandSender PopUpWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, const VariantList& items, const string& label, int labelWidth = 0, int cmd = 0); - virtual ~PopUpWidget() = default; + ~PopUpWidget() override = default; void setID(uInt32 id); diff --git a/src/gui/ProgressDialog.hxx b/src/gui/ProgressDialog.hxx index 24ca54539..0ec8731b5 100644 --- a/src/gui/ProgressDialog.hxx +++ b/src/gui/ProgressDialog.hxx @@ -29,7 +29,7 @@ class ProgressDialog : public Dialog public: ProgressDialog(GuiObject* boss, const GUI::Font& font, const string& message); - virtual ~ProgressDialog() = default; + ~ProgressDialog() override = default; void setMessage(const string& message); void setRange(int begin, int end, int step); diff --git a/src/gui/R77HelpDialog.hxx b/src/gui/R77HelpDialog.hxx index 731de5e65..0e51af2c7 100644 --- a/src/gui/R77HelpDialog.hxx +++ b/src/gui/R77HelpDialog.hxx @@ -31,7 +31,7 @@ class R77HelpDialog : public Dialog { public: R77HelpDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - virtual ~R77HelpDialog() = default; + ~R77HelpDialog() override = default; private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/RomAuditDialog.hxx b/src/gui/RomAuditDialog.hxx index ebad2174d..3bc2a5969 100644 --- a/src/gui/RomAuditDialog.hxx +++ b/src/gui/RomAuditDialog.hxx @@ -37,7 +37,7 @@ class RomAuditDialog : public Dialog public: RomAuditDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~RomAuditDialog(); + ~RomAuditDialog() override; private: void loadConfig() override; diff --git a/src/gui/RomInfoWidget.hxx b/src/gui/RomInfoWidget.hxx index e2ea566ca..dbf3beee1 100644 --- a/src/gui/RomInfoWidget.hxx +++ b/src/gui/RomInfoWidget.hxx @@ -33,7 +33,7 @@ class RomInfoWidget : public Widget RomInfoWidget(GuiObject *boss, const GUI::Font& font, int x, int y, int w, int h, const Common::Size& imgSize); - virtual ~RomInfoWidget() = default; + ~RomInfoWidget() override = default; void setProperties(const FilesystemNode& node, const string& md5); void clearProperties(); diff --git a/src/gui/ScrollBarWidget.hxx b/src/gui/ScrollBarWidget.hxx index 7752e8ab7..1d1b4c34a 100644 --- a/src/gui/ScrollBarWidget.hxx +++ b/src/gui/ScrollBarWidget.hxx @@ -29,7 +29,7 @@ class ScrollBarWidget : public Widget, public CommandSender public: ScrollBarWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~ScrollBarWidget() = default; + ~ScrollBarWidget() override = default; void recalc(); void handleMouseWheel(int x, int y, int direction) override; diff --git a/src/gui/SnapshotDialog.hxx b/src/gui/SnapshotDialog.hxx index 94cedff11..6c9a30118 100644 --- a/src/gui/SnapshotDialog.hxx +++ b/src/gui/SnapshotDialog.hxx @@ -35,7 +35,7 @@ class SnapshotDialog : public Dialog public: SnapshotDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~SnapshotDialog(); + ~SnapshotDialog() override; private: void loadConfig() override; diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx index 6f7cfe8a8..4deb620a9 100644 --- a/src/gui/StellaSettingsDialog.hxx +++ b/src/gui/StellaSettingsDialog.hxx @@ -40,7 +40,7 @@ class StellaSettingsDialog : public Dialog public: StellaSettingsDialog(OSystem& osystem, DialogContainer& parent, int max_w, int max_h, Menu::AppMode mode); - virtual ~StellaSettingsDialog(); + ~StellaSettingsDialog() override; private: void loadConfig() override; diff --git a/src/gui/StringListWidget.hxx b/src/gui/StringListWidget.hxx index 10c197509..490c6b6a2 100644 --- a/src/gui/StringListWidget.hxx +++ b/src/gui/StringListWidget.hxx @@ -26,7 +26,7 @@ class StringListWidget : public ListWidget public: StringListWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, bool hilite = true); - virtual ~StringListWidget() = default; + ~StringListWidget() override = default; void setList(const StringList& list); bool wantsFocus() const override { return true; } diff --git a/src/gui/TabWidget.hxx b/src/gui/TabWidget.hxx index cd6547b50..1f581df5c 100644 --- a/src/gui/TabWidget.hxx +++ b/src/gui/TabWidget.hxx @@ -35,7 +35,7 @@ class TabWidget : public Widget, public CommandSender public: TabWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~TabWidget(); + ~TabWidget() override; // use Dialog::releaseFocus() when changing to another tab diff --git a/src/gui/TimeMachine.hxx b/src/gui/TimeMachine.hxx index 9854274da..e8b3be33f 100644 --- a/src/gui/TimeMachine.hxx +++ b/src/gui/TimeMachine.hxx @@ -31,7 +31,7 @@ class TimeMachine : public DialogContainer { public: explicit TimeMachine(OSystem& osystem); - virtual ~TimeMachine(); + ~TimeMachine() override; /** This dialog has an adjustable size. We need to make sure the diff --git a/src/gui/TimeMachineDialog.hxx b/src/gui/TimeMachineDialog.hxx index 283249514..a4a489b79 100644 --- a/src/gui/TimeMachineDialog.hxx +++ b/src/gui/TimeMachineDialog.hxx @@ -29,7 +29,7 @@ class TimeMachineDialog : public Dialog { public: TimeMachineDialog(OSystem& osystem, DialogContainer& parent, int width); - virtual ~TimeMachineDialog() = default; + ~TimeMachineDialog() override = default; /** set/get number of winds when entering the dialog */ void setEnterWinds(Int32 numWinds) { _enterWinds = numWinds; } diff --git a/src/gui/UIDialog.hxx b/src/gui/UIDialog.hxx index 6ed1c655f..544f6c764 100644 --- a/src/gui/UIDialog.hxx +++ b/src/gui/UIDialog.hxx @@ -25,7 +25,7 @@ class UIDialog : public Dialog, public CommandSender public: UIDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, GuiObject* boss, int max_w, int max_h); - virtual ~UIDialog(); + ~UIDialog() override; private: void loadConfig() override; diff --git a/src/gui/VideoAudioDialog.hxx b/src/gui/VideoAudioDialog.hxx index ef0f850a8..7f0fd817e 100644 --- a/src/gui/VideoAudioDialog.hxx +++ b/src/gui/VideoAudioDialog.hxx @@ -39,7 +39,7 @@ class VideoAudioDialog : public Dialog public: VideoAudioDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~VideoAudioDialog() = default; + ~VideoAudioDialog() override = default; private: void loadConfig() override; diff --git a/src/gui/WhatsNewDialog.hxx b/src/gui/WhatsNewDialog.hxx index d90edbd15..9c4154220 100644 --- a/src/gui/WhatsNewDialog.hxx +++ b/src/gui/WhatsNewDialog.hxx @@ -25,7 +25,7 @@ class WhatsNewDialog : public Dialog public: WhatsNewDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h); - virtual ~WhatsNewDialog() = default; + ~WhatsNewDialog() override = default; private: void add(int& ypos, const string& text); diff --git a/src/gui/Widget.hxx b/src/gui/Widget.hxx index b20b8b159..3add250ba 100644 --- a/src/gui/Widget.hxx +++ b/src/gui/Widget.hxx @@ -57,7 +57,7 @@ class Widget : public GuiObject public: Widget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h); - virtual ~Widget(); + ~Widget() override; virtual int getAbsX() const override { return _x + _boss->getChildX(); } virtual int getAbsY() const override { return _y + _boss->getChildY(); } @@ -187,7 +187,7 @@ class StaticTextWidget : public Widget int x, int y, const string& text = "", TextAlign align = TextAlign::Left, ColorId shadowColor = kNone); - virtual ~StaticTextWidget() = default; + ~StaticTextWidget() override = default; void setValue(int value); void setLabel(const string& label); void setAlign(TextAlign align) { _align = align; setDirty(); } @@ -228,7 +228,7 @@ class ButtonWidget : public StaticTextWidget, public CommandSender int x, int y, int dw, int dh, const uInt32* bitmap, int bmw, int bmh, int cmd = 0, bool repeat = false); - virtual ~ButtonWidget() = default; + ~ButtonWidget() override = default; void setCmd(int cmd) { _cmd = cmd; } int getCmd() const { return _cmd; } @@ -271,7 +271,7 @@ class CheckboxWidget : public ButtonWidget public: CheckboxWidget(GuiObject* boss, const GUI::Font& font, int x, int y, const string& label, int cmd = 0); - virtual ~CheckboxWidget() = default; + ~CheckboxWidget() override = default; void setEditable(bool editable); void setFill(FillType type); @@ -333,7 +333,7 @@ class SliderWidget : public ButtonWidget const string& label = "", int labelWidth = 0, int cmd = 0, int valueLabelWidth = 0, const string& valueUnit = "", int valueLabelGap = 0, bool forceLabelSign = false); - virtual ~SliderWidget() = default; + ~SliderWidget() override = default; void setValue(int value); int getValue() const { return _value; } diff --git a/src/libretro/EventHandlerLIBRETRO.cxx b/src/libretro/EventHandlerLIBRETRO.cxx index d14f2bfd6..046839032 100644 --- a/src/libretro/EventHandlerLIBRETRO.cxx +++ b/src/libretro/EventHandlerLIBRETRO.cxx @@ -31,8 +31,10 @@ EventHandlerLIBRETRO::~EventHandlerLIBRETRO() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void EventHandlerLIBRETRO::enableTextEvents(bool enable) -{} +{ +} // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void EventHandlerLIBRETRO::pollEvent() -{} +{ +} diff --git a/src/libretro/EventHandlerLIBRETRO.hxx b/src/libretro/EventHandlerLIBRETRO.hxx index 08b42b1e8..3357e0997 100644 --- a/src/libretro/EventHandlerLIBRETRO.hxx +++ b/src/libretro/EventHandlerLIBRETRO.hxx @@ -34,7 +34,7 @@ class EventHandlerLIBRETRO : public EventHandler Create a new LIBRETRO event handler object */ explicit EventHandlerLIBRETRO(OSystem& osystem); - virtual ~EventHandlerLIBRETRO(); + ~EventHandlerLIBRETRO() override; private: /** diff --git a/src/libretro/FBSurfaceLIBRETRO.hxx b/src/libretro/FBSurfaceLIBRETRO.hxx index e7423efce..89809e011 100644 --- a/src/libretro/FBSurfaceLIBRETRO.hxx +++ b/src/libretro/FBSurfaceLIBRETRO.hxx @@ -33,7 +33,7 @@ class FBSurfaceLIBRETRO : public FBSurface public: FBSurfaceLIBRETRO(FrameBufferLIBRETRO& buffer, uInt32 width, uInt32 height, const uInt32* data); - virtual ~FBSurfaceLIBRETRO() { } + ~FBSurfaceLIBRETRO() override { } // Most of the surface drawing primitives are implemented in FBSurface; void fillRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h, ColorId color) override { } diff --git a/src/libretro/FrameBufferLIBRETRO.hxx b/src/libretro/FrameBufferLIBRETRO.hxx index 4ac6dbb30..a57a218d2 100644 --- a/src/libretro/FrameBufferLIBRETRO.hxx +++ b/src/libretro/FrameBufferLIBRETRO.hxx @@ -39,7 +39,7 @@ class FrameBufferLIBRETRO : public FrameBuffer Creates a new LIBRETRO framebuffer */ explicit FrameBufferLIBRETRO(OSystem& osystem); - virtual ~FrameBufferLIBRETRO() { } + ~FrameBufferLIBRETRO() override { } ////////////////////////////////////////////////////////////////////// // The following are derived from public methods in FrameBuffer.hxx diff --git a/src/libretro/OSystemLIBRETRO.hxx b/src/libretro/OSystemLIBRETRO.hxx index 8d978c497..60b1fc4e5 100644 --- a/src/libretro/OSystemLIBRETRO.hxx +++ b/src/libretro/OSystemLIBRETRO.hxx @@ -32,7 +32,7 @@ class OSystemLIBRETRO : public OSystem { public: OSystemLIBRETRO() = default; - virtual ~OSystemLIBRETRO() = default; + ~OSystemLIBRETRO() override = default; /** Determine the base directory and main configuration file from the diff --git a/src/libretro/SoundLIBRETRO.hxx b/src/libretro/SoundLIBRETRO.hxx index 7f68c0127..8bdb77fd3 100644 --- a/src/libretro/SoundLIBRETRO.hxx +++ b/src/libretro/SoundLIBRETRO.hxx @@ -29,7 +29,7 @@ class AudioSettings; #include "Sound.hxx" /** - This class implements the sound API for LIBRTRO. + This class implements the sound API for LIBRETRO. @author Stephen Anthony and Christian Speckner (DirtyHairy) */ @@ -41,11 +41,7 @@ class SoundLIBRETRO : public Sound using the object. */ SoundLIBRETRO(OSystem& osystem, AudioSettings& audioSettings); - - /** - Destructor - */ - virtual ~SoundLIBRETRO(); + ~SoundLIBRETRO() override; public: /** diff --git a/src/libretro/StellaLIBRETRO.hxx b/src/libretro/StellaLIBRETRO.hxx index b3d87725b..64bc91651 100644 --- a/src/libretro/StellaLIBRETRO.hxx +++ b/src/libretro/StellaLIBRETRO.hxx @@ -40,7 +40,6 @@ class StellaLIBRETRO { public: StellaLIBRETRO(); - virtual ~StellaLIBRETRO() = default; public: OSystemLIBRETRO& osystem() { return *myOSystem; } diff --git a/src/macos/OSystemMACOS.hxx b/src/macos/OSystemMACOS.hxx index 5a5591953..89d6638c1 100644 --- a/src/macos/OSystemMACOS.hxx +++ b/src/macos/OSystemMACOS.hxx @@ -32,7 +32,7 @@ class OSystemMACOS : public OSystem { public: OSystemMACOS() = default; - virtual ~OSystemMACOS() = default; + ~OSystemMACOS() override = default; /** Determine the base directory and main configuration file from the diff --git a/src/macos/SerialPortMACOS.hxx b/src/macos/SerialPortMACOS.hxx index 3d71d5135..12dbcf28e 100644 --- a/src/macos/SerialPortMACOS.hxx +++ b/src/macos/SerialPortMACOS.hxx @@ -30,7 +30,7 @@ class SerialPortMACOS : public SerialPort { public: SerialPortMACOS(); - virtual ~SerialPortMACOS(); + ~SerialPortMACOS() override; /** Open the given serial port with the specified attributes. diff --git a/src/unix/OSystemUNIX.hxx b/src/unix/OSystemUNIX.hxx index b2e11eab2..b562a3c3d 100644 --- a/src/unix/OSystemUNIX.hxx +++ b/src/unix/OSystemUNIX.hxx @@ -32,7 +32,7 @@ class OSystemUNIX : public OSystem { public: OSystemUNIX() = default; - virtual ~OSystemUNIX() = default; + ~OSystemUNIX() override = default; /** Determine the base directory and main configuration file from the diff --git a/src/unix/SerialPortUNIX.hxx b/src/unix/SerialPortUNIX.hxx index 7a675298e..4dec5a116 100644 --- a/src/unix/SerialPortUNIX.hxx +++ b/src/unix/SerialPortUNIX.hxx @@ -30,7 +30,7 @@ class SerialPortUNIX : public SerialPort { public: SerialPortUNIX(); - virtual ~SerialPortUNIX(); + ~SerialPortUNIX() override; /** Open the given serial port with the specified attributes. diff --git a/src/unix/r77/OSystemR77.hxx b/src/unix/r77/OSystemR77.hxx index 6ed09a4e4..58d80d80e 100644 --- a/src/unix/r77/OSystemR77.hxx +++ b/src/unix/r77/OSystemR77.hxx @@ -34,7 +34,7 @@ class OSystemR77 : public OSystem { public: OSystemR77() = default; - virtual ~OSystemR77() = default; + ~OSystemR77() override = default; /** Determine the base directory and main configuration file from the diff --git a/src/unix/r77/SettingsR77.hxx b/src/unix/r77/SettingsR77.hxx index e231a34d5..a5f58018a 100644 --- a/src/unix/r77/SettingsR77.hxx +++ b/src/unix/r77/SettingsR77.hxx @@ -33,7 +33,7 @@ class SettingsR77 : public Settings Create a new UNIX settings object */ explicit SettingsR77(); - virtual ~SettingsR77() = default; + ~SettingsR77() override = default; private: // Following constructors and assignment operators not supported diff --git a/src/windows/OSystemWINDOWS.hxx b/src/windows/OSystemWINDOWS.hxx index 786783bd3..4995f9f51 100644 --- a/src/windows/OSystemWINDOWS.hxx +++ b/src/windows/OSystemWINDOWS.hxx @@ -32,7 +32,7 @@ class OSystemWINDOWS : public OSystem { public: OSystemWINDOWS() = default; - virtual ~OSystemWINDOWS() = default; + ~OSystemWINDOWS() override = default; /** Determine the base directory and main configuration file from the diff --git a/src/windows/SerialPortWINDOWS.hxx b/src/windows/SerialPortWINDOWS.hxx index 3f8513573..adab57ce6 100644 --- a/src/windows/SerialPortWINDOWS.hxx +++ b/src/windows/SerialPortWINDOWS.hxx @@ -29,7 +29,7 @@ class SerialPortWINDOWS : public SerialPort { public: SerialPortWINDOWS(); - virtual ~SerialPortWINDOWS(); + ~SerialPortWINDOWS() override; /** Open the given serial port with the specified attributes.