Fairly large commit, but basically it is only enabling the 'override'

C++11 keyword.  This makes developing/maintaining class hierarchies
more manageable.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3182 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

src/cheat/BankRomCheat.hxx

@@ -28,9 +28,9 @@ class BankRomCheat : public Cheat
     BankRomCheat(OSystem& os, const string& name, const string& code);
     virtual ~BankRomCheat() { }
 
-    bool enable();
+    bool enable() override;
-    bool disable();
+    bool disable() override;
-    void evaluate();
+    void evaluate() override;
 
   private:
     uInt8  savedRom[16];

src/cheat/CheatCodeDialog.hxx

@@ -41,9 +41,9 @@ class CheatCodeDialog : public Dialog
     virtual ~CheatCodeDialog();
 
   protected:
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
-    void loadConfig();
+    void loadConfig() override;
-    void saveConfig();
+    void saveConfig() override;
 
   private:
     void addCheat();

src/cheat/CheetahCheat.hxx

@@ -28,9 +28,9 @@ class CheetahCheat : public Cheat
     CheetahCheat(OSystem& os, const string& name, const string& code);
     virtual ~CheetahCheat() { }
 
-    bool enable();
+    bool enable() override;
-    bool disable();
+    bool disable() override;
-    void evaluate();
+    void evaluate() override;
 
   private:
     uInt8  savedRom[16];

src/cheat/RamCheat.hxx

@@ -28,9 +28,9 @@ class RamCheat : public Cheat
     RamCheat(OSystem& os, const string& name, const string& code);
     virtual ~RamCheat() { }
 
-    bool enable();
+    bool enable() override;
-    bool disable();
+    bool disable() override;
-    void evaluate();
+    void evaluate() override;
 
   private:
     uInt16 address;

src/common/EventHandlerSDL2.hxx

@@ -48,19 +48,19 @@ class EventHandlerSDL2 : public EventHandler
     /**
       Enable/disable text events (distinct from single-key events).
     */
-    void enableTextEvents(bool enable);
+    void enableTextEvents(bool enable) override;
 
     /**
       Returns the human-readable name for a StellaKey.
     */
-    const char* nameForKey(StellaKey key) const {
+    const char* nameForKey(StellaKey key) const override {
       return SDL_GetScancodeName(SDL_Scancode(key));
     }
 
     /**
       Collects and dispatches any pending SDL2 events.
     */
-    void pollEvent();
+    void pollEvent() override;
 
   private:
     SDL_Event myEvent;

src/common/FBSurfaceSDL2.hxx

@@ -39,30 +39,30 @@ class FBSurfaceSDL2 : public FBSurface
     // Most of the surface drawing primitives are implemented in FBSurface;
     // the ones implemented here use SDL-specific code for extra performance
     //
-    void fillRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h, uInt32 color);
+    void fillRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h, uInt32 color) override;
     // With hardware surfaces, it's faster to just update the entire surface
-    void setDirty() { mySurfaceIsDirty = true; }
+    void setDirty() override { mySurfaceIsDirty = true; }
 
-    uInt32 width() const;
+    uInt32 width() const override;
-    uInt32 height() const;
+    uInt32 height() const override;
 
-    const GUI::Rect& srcRect() const;
+    const GUI::Rect& srcRect() const override;
-    const GUI::Rect& dstRect() const;
+    const GUI::Rect& dstRect() const override;
-    void setSrcPos(uInt32 x, uInt32 y);
+    void setSrcPos(uInt32 x, uInt32 y) override;
-    void setSrcSize(uInt32 w, uInt32 h);
+    void setSrcSize(uInt32 w, uInt32 h) override;
-    void setDstPos(uInt32 x, uInt32 y);
+    void setDstPos(uInt32 x, uInt32 y) override;
-    void setDstSize(uInt32 w, uInt32 h);
+    void setDstSize(uInt32 w, uInt32 h) override;
-    void setVisible(bool visible);
+    void setVisible(bool visible) override;
 
-    void translateCoords(Int32& x, Int32& y) const;
+    void translateCoords(Int32& x, Int32& y) const override;
-    bool render();
+    bool render() override;
-    void invalidate();
+    void invalidate() override;
-    void free();
+    void free() override;
-    void reload();
+    void reload() override;
-    void resize(uInt32 width, uInt32 height);
+    void resize(uInt32 width, uInt32 height) override;
 
   protected:
-    void applyAttributes(bool immediate);
+    void applyAttributes(bool immediate) override;
 
   private:
     void createSurface(uInt32 width, uInt32 height, const uInt32* data);

src/common/FrameBufferSDL2.hxx

@@ -62,12 +62,12 @@ class FrameBufferSDL2 : public FrameBuffer
     /**
       Shows or hides the cursor based on the given boolean value.
     */
-    void showCursor(bool show);
+    void showCursor(bool show) override;
 
     /**
       Answers if the display is currently in fullscreen mode.
     */
-    bool fullScreen() const;
+    bool fullScreen() const override;
 
     /**
       This method is called to retrieve the R/G/B data from the given pixel.
@@ -77,7 +77,7 @@ class FrameBufferSDL2 : public FrameBuffer
       @param g      The green component of the color
       @param b      The blue component of the color
     */
-    inline void getRGB(Uint32 pixel, Uint8* r, Uint8* g, Uint8* b) const
+    inline void getRGB(Uint32 pixel, Uint8* r, Uint8* g, Uint8* b) const override
       { SDL_GetRGB(pixel, myPixelFormat, r, g, b); }
 
     /**
@@ -87,7 +87,7 @@ class FrameBufferSDL2 : public FrameBuffer
       @param g  The green component of the color.
       @param b  The blue component of the color.
     */
-    inline Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) const
+    inline Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) const override
       { return SDL_MapRGB(myPixelFormat, r, g, b); }
 
     /**
@@ -100,7 +100,7 @@ class FrameBufferSDL2 : public FrameBuffer
       @param pitch   The pitch (in bytes) for the pixel data
       @param rect    The bounding rectangle for the buffer
     */
-    void readPixels(uInt8* buffer, uInt32 pitch, const GUI::Rect& rect) const;
+    void readPixels(uInt8* buffer, uInt32 pitch, const GUI::Rect& rect) const override;
 
   protected:
     //////////////////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@ class FrameBufferSDL2 : public FrameBuffer
       This method is called to query and initialize the video hardware
       for desktop and fullscreen resolution information.
     */
-    void queryHardware(vector<GUI::Size>& displays, VariantList& renderers);
+    void queryHardware(vector<GUI::Size>& displays, VariantList& renderers) override;
 
     /**
       This method is called to query the video hardware for the index
@@ -119,7 +119,7 @@ class FrameBufferSDL2 : public FrameBuffer
       @return  the current display index or a negative value if no
                window is displayed
     */
-    Int32 getCurrentDisplayIndex();
+    Int32 getCurrentDisplayIndex() override;
 
     /**
       This method is called to change to the given video mode.
@@ -129,14 +129,14 @@ class FrameBufferSDL2 : public FrameBuffer
 
       @return  False on any errors, else true
     */
-    bool setVideoMode(const string& title, const VideoMode& mode);
+    bool setVideoMode(const string& title, const VideoMode& mode) override;
 
     /**
       This method is called to invalidate the contents of the entire
       framebuffer (ie, mark the current content as invalid, and erase it on
       the next drawing pass).
     */
-    void invalidate();
+    void invalidate() override;
 
     /**
       This method is called to create a surface with the given attributes.
@@ -145,27 +145,27 @@ class FrameBufferSDL2 : public FrameBuffer
       @param h     The requested height of the new surface.
       @param data  If non-null, use the given data values as a static surface
     */
-    unique_ptr<FBSurface> createSurface(uInt32 w, uInt32 h, const uInt32* data) const;
+    unique_ptr<FBSurface> createSurface(uInt32 w, uInt32 h, const uInt32* data) const override;
 
     /**
       Grabs or ungrabs the mouse based on the given boolean value.
     */
-    void grabMouse(bool grab);
+    void grabMouse(bool grab) override;
 
     /**
       Set the icon for the main SDL window.
     */
-    void setWindowIcon();
+    void setWindowIcon() override;
 
     /**
       This method is called to provide information about the FrameBuffer.
     */
-    string about() const;
+    string about() const override;
 
     /**
       This method is called after any drawing is done (per-frame).
     */
-    void postFrameUpdate();
+    void postFrameUpdate() override;
 
   private:
     // The SDL video buffer

src/common/SoundNull.hxx

@@ -57,7 +57,7 @@ class SoundNull : public Sound
       @param enable  Either true or false, to enable or disable the sound system
       @return        Whether the sound system was enabled or disabled
     */
-    void setEnabled(bool enable) { }
+    void setEnabled(bool enable) override { }
 
     /**
       The system cycle counter is being adjusting by the specified amount.  Any
@@ -65,14 +65,14 @@ class SoundNull : public Sound
 
       @param amount The amount the cycle counter is being adjusted by
     */
-    void adjustCycleCounter(Int32 amount) { }
+    void adjustCycleCounter(Int32 amount) override { }
 
     /**
       Sets the number of channels (mono or stereo sound).
 
       @param channels The number of channels
     */
-    void setChannels(uInt32 channels) { }
+    void setChannels(uInt32 channels) override { }
 
     /**
       Sets the display framerate.  Sound generation for NTSC and PAL games
@@ -80,26 +80,26 @@ class SoundNull : public Sound
 
       @param framerate The base framerate depending on NTSC or PAL ROM
     */
-    void setFrameRate(float framerate) { }
+    void setFrameRate(float framerate) override { }
 
     /**
       Initializes the sound device.  This must be called before any
       calls are made to derived methods.
     */
-    void open() { }
+    void open() override { }
 
     /**
       Should be called to close the sound device.  Once called the sound
       device can be started again using the initialize method.
     */
-    void close() { }
+    void close() override { }
 
     /**
       Set the mute state of the sound object.  While muted no sound is played.
 
       @param state Mutes sound if true, unmute if false
     */
-    void mute(bool state) { }
+    void mute(bool state) override { }
 
     /**
       Reset the sound device.
@@ -113,7 +113,7 @@ class SoundNull : public Sound
       @param value The value to save into the register
       @param cycle The system cycle at which the register is being updated
     */
-    void set(uInt16 addr, uInt8 value, Int32 cycle) { }
+    void set(uInt16 addr, uInt8 value, Int32 cycle) override { }
 
     /**
       Sets the volume of the sound device to the specified level.  The
@@ -122,7 +122,7 @@ class SoundNull : public Sound
 
       @param percent The new volume percentage level for the sound device
     */
-    void setVolume(Int32 percent) { }
+    void setVolume(Int32 percent) override { }
 
     /**
       Adjusts the volume of the sound device based on the given direction.
@@ -130,7 +130,7 @@ class SoundNull : public Sound
       @param direction  Increase or decrease the current volume by a predefined
                         amount based on the direction (1 = increase, -1 =decrease)
     */
-    void adjustVolume(Int8 direction) { }
+    void adjustVolume(Int8 direction) override { }
 
   public:
     /**

src/common/SoundSDL2.hxx

@@ -56,7 +56,7 @@ class SoundSDL2 : public Sound
 
       @param state  True or false, to enable or disable the sound system
     */
-    void setEnabled(bool state);
+    void setEnabled(bool state) override;
 
     /**
       The system cycle counter is being adjusting by the specified amount. Any
@@ -64,7 +64,7 @@ class SoundSDL2 : public Sound
 
       @param amount  The amount the cycle counter is being adjusted by
     */
-    void adjustCycleCounter(Int32 amount);
+    void adjustCycleCounter(Int32 amount) override;
 
     /**
       Sets the number of channels (mono or stereo sound).  Note that this
@@ -75,7 +75,7 @@ class SoundSDL2 : public Sound
 
       @param channels  The number of channels
     */
-    void setChannels(uInt32 channels);
+    void setChannels(uInt32 channels) override;
 
     /**
       Sets the display framerate.  Sound generation for NTSC and PAL games
@@ -83,31 +83,31 @@ class SoundSDL2 : public Sound
 
       @param framerate The base framerate depending on NTSC or PAL ROM
     */
-    void setFrameRate(float framerate);
+    void setFrameRate(float framerate) override;
 
     /**
       Initializes the sound device.  This must be called before any
       calls are made to derived methods.
     */
-    void open();
+    void open() override;
 
     /**
       Should be called to close the sound device.  Once called the sound
       device can be started again using the open method.
     */
-    void close();
+    void close() override;
 
     /**
       Set the mute state of the sound object.  While muted no sound is played.
 
       @param state  Mutes sound if true, unmute if false
     */
-    void mute(bool state);
+    void mute(bool state) override;
 
     /**
       Reset the sound device.
     */
-    void reset();
+    void reset() override;
 
     /**
       Sets the sound register to a given value.
@@ -116,7 +116,7 @@ class SoundSDL2 : public Sound
       @param value  The value to save into the register
       @param cycle  The system cycle at which the register is being updated
     */
-    void set(uInt16 addr, uInt8 value, Int32 cycle);
+    void set(uInt16 addr, uInt8 value, Int32 cycle) override;
 
     /**
       Sets the volume of the sound device to the specified level.  The
@@ -125,7 +125,7 @@ class SoundSDL2 : public Sound
 
       @param percent  The new volume percentage level for the sound device
     */
-    void setVolume(Int32 percent);
+    void setVolume(Int32 percent) override;
 
     /**
       Adjusts the volume of the sound device based on the given direction.
@@ -133,7 +133,7 @@ class SoundSDL2 : public Sound
       @param direction  Increase or decrease the current volume by a predefined
                         amount based on the direction (1 = increase, -1 = decrease)
     */
-    void adjustVolume(Int8 direction);
+    void adjustVolume(Int8 direction) override;
 
   public:
     /**
@@ -142,7 +142,7 @@ class SoundSDL2 : public Sound
       @param out  The serializer device to save to.
       @return  The result of the save.  True on success, false on failure.
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Loads the current state of this device from the given Serializer.
@@ -150,14 +150,14 @@ class SoundSDL2 : public Sound
       @param in  The Serializer device to load from.
       @return  The result of the load.  True on success, false on failure.
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for this console class (used in error checking).
 
       @return  The name of the object
     */
-    string name() const { return "TIASound"; }
+    string name() const override { return "TIASound"; }
 
   protected:
     /**

src/debugger/CartDebug.cxx

@@ -1155,7 +1155,7 @@ string CartDebug::saveRom()
 
   FilesystemNode node(path);
   ofstream out(node.getPath(), ios::binary);
-  if(out.is_open() && myConsole.cartridge().save(out))
+  if(out && myConsole.cartridge().saveROM(out))
     return "saved ROM as " + node.getShortPath();
   else
     return DebuggerParser::red("failed to save ROM");

src/debugger/CartDebug.hxx

@@ -91,11 +91,11 @@ class CartDebug : public DebuggerSystem
     CartDebug(Debugger& dbg, Console& console, const OSystem& osystem);
     virtual ~CartDebug();
 
-    const DebuggerState& getState();
+    const DebuggerState& getState() override;
-    const DebuggerState& getOldState() { return myOldState; }
+    const DebuggerState& getOldState() override { return myOldState; }
 
-    void saveOldState();
+    void saveOldState() override;
-    string toString();
+    string toString() override;
 
     // Used to get/set the debug widget, which contains cart-specific
     // functionality

src/debugger/CpuDebug.hxx

@@ -40,11 +40,11 @@ class CpuDebug : public DebuggerSystem
   public:
     CpuDebug(Debugger& dbg, Console& console);
 
-    const DebuggerState& getState();
+    const DebuggerState& getState() override;
-    const DebuggerState& getOldState() { return myOldState; }
+    const DebuggerState& getOldState() override { return myOldState; }
 
-    void saveOldState();
+    void saveOldState() override;
-    string toString() { return EmptyString; } // Not needed, since CPU stuff is always visible
+    string toString() override { return EmptyString; } // Not needed, since CPU stuff is always visible
 
     // I know, we ain't supposed to do this...
     M6502& m6502() const { return mySystem.m6502(); }

src/debugger/DebuggerExpressions.hxx

@@ -39,7 +39,7 @@ class BinAndExpression : public Expression
 {
   public:
     BinAndExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() & myRHS->evaluate(); }
 };
 
@@ -48,7 +48,7 @@ class BinNotExpression : public Expression
 {
   public:
     BinNotExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return ~(myLHS->evaluate()); }
 };
 
@@ -57,7 +57,7 @@ class BinOrExpression : public Expression
 {
   public:
     BinOrExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() | myRHS->evaluate(); }
 };
 
@@ -66,7 +66,7 @@ class BinXorExpression : public Expression
 {
   public:
     BinXorExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() ^ myRHS->evaluate(); }
 };
 
@@ -75,7 +75,7 @@ class ByteDerefExpression : public Expression
 {
   public:
     ByteDerefExpression(Expression* left): Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return Debugger::debugger().peek(myLHS->evaluate()); }
 };
 
@@ -84,7 +84,7 @@ class ByteDerefOffsetExpression : public Expression
 {
   public:
     ByteDerefOffsetExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return Debugger::debugger().peek(myLHS->evaluate() + myRHS->evaluate()); }
 };
 
@@ -93,7 +93,7 @@ class ConstExpression : public Expression
 {
   public:
     ConstExpression(const int value) : Expression(), myValue(value) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myValue; }
 
   private:
@@ -105,7 +105,7 @@ class CpuMethodExpression : public Expression
 {
   public:
     CpuMethodExpression(CpuMethod method) : Expression(), myMethod(std::mem_fn(method)) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myMethod(Debugger::debugger().cpuDebug()); }
 
   private:
@@ -117,7 +117,7 @@ class DivExpression : public Expression
 {
   public:
     DivExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { int denom = myRHS->evaluate();
         return denom == 0 ? 0 : myLHS->evaluate() / denom; }
 };
@@ -127,7 +127,7 @@ class EqualsExpression : public Expression
 {
   public:
     EqualsExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() == myRHS->evaluate(); }
 };
 
@@ -136,7 +136,7 @@ class EquateExpression : public Expression
 {
   public:
     EquateExpression(const string& label) : Expression(), myLabel(label) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return Debugger::debugger().cartDebug().getAddress(myLabel); }
 
   private:
@@ -148,7 +148,7 @@ class FunctionExpression : public Expression
 {
   public:
     FunctionExpression(const string& label) : Expression(), myLabel(label) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return Debugger::debugger().getFunction(myLabel).evaluate(); }
 
   private:
@@ -160,7 +160,7 @@ class GreaterEqualsExpression : public Expression
 {
   public:
     GreaterEqualsExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() >= myRHS->evaluate(); }
 };
 
@@ -169,7 +169,7 @@ class GreaterExpression : public Expression
 {
   public:
     GreaterExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() > myRHS->evaluate(); }
 };
 
@@ -178,7 +178,7 @@ class HiByteExpression : public Expression
 {
   public:
     HiByteExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return 0xff & (myLHS->evaluate() >> 8); }
 };
 
@@ -187,7 +187,7 @@ class LessEqualsExpression : public Expression
 {
   public:
     LessEqualsExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() <= myRHS->evaluate(); }
 };
 
@@ -196,7 +196,7 @@ class LessExpression : public Expression
 {
   public:
     LessExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() < myRHS->evaluate(); }
 };
 
@@ -205,7 +205,7 @@ class LoByteExpression : public Expression
 {
   public:
     LoByteExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return 0xff & myLHS->evaluate(); }
 };
 
@@ -214,7 +214,7 @@ class LogAndExpression : public Expression
 {
   public:
     LogAndExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() && myRHS->evaluate(); }
 };
 
@@ -223,7 +223,7 @@ class LogNotExpression : public Expression
 {
   public:
     LogNotExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return !(myLHS->evaluate()); }
 };
 
@@ -232,7 +232,7 @@ class LogOrExpression : public Expression
 {
   public:
     LogOrExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() || myRHS->evaluate(); }
 };
 
@@ -241,7 +241,7 @@ class MinusExpression : public Expression
 {
   public:
     MinusExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() - myRHS->evaluate(); }
 };
 
@@ -250,7 +250,7 @@ class ModExpression : public Expression
 {
   public:
     ModExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { int rhs = myRHS->evaluate();
         return rhs == 0 ? 0 : myLHS->evaluate() % rhs; }
 };
@@ -260,7 +260,7 @@ class MultExpression : public Expression
 {
   public:
     MultExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() * myRHS->evaluate(); }
 };
 
@@ -269,7 +269,7 @@ class NotEqualsExpression : public Expression
 {
   public:
     NotEqualsExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() != myRHS->evaluate(); }
 };
 
@@ -278,7 +278,7 @@ class PlusExpression : public Expression
 {
   public:
     PlusExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() + myRHS->evaluate(); }
 };
 
@@ -287,7 +287,7 @@ class CartMethodExpression : public Expression
 {
   public:
     CartMethodExpression(CartMethod method) : Expression(), myMethod(std::mem_fn(method)) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myMethod(Debugger::debugger().cartDebug()); }
 
   private:
@@ -299,7 +299,7 @@ class ShiftLeftExpression : public Expression
 {
   public:
     ShiftLeftExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() << myRHS->evaluate(); }
 };
 
@@ -308,7 +308,7 @@ class ShiftRightExpression : public Expression
 {
   public:
     ShiftRightExpression(Expression* left, Expression* right) : Expression(left, right) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myLHS->evaluate() >> myRHS->evaluate(); }
 };
 
@@ -317,7 +317,7 @@ class TiaMethodExpression : public Expression
 {
   public:
     TiaMethodExpression(TiaMethod method) : Expression(), myMethod(std::mem_fn(method)) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return myMethod(Debugger::debugger().tiaDebug()); }
 
   private:
@@ -329,7 +329,7 @@ class UnaryMinusExpression : public Expression
 {
   public:
     UnaryMinusExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return -(myLHS->evaluate()); }
 };
 
@@ -338,7 +338,7 @@ class WordDerefExpression : public Expression
 {
   public:
     WordDerefExpression(Expression* left) : Expression(left) { }
-    uInt16 evaluate() const
+    uInt16 evaluate() const override
       { return Debugger::debugger().dpeek(myLHS->evaluate()); }
 };
 

src/debugger/RiotDebug.hxx

@@ -49,11 +49,11 @@ class RiotDebug : public DebuggerSystem
   public:
     RiotDebug(Debugger& dbg, Console& console);
 
-    const DebuggerState& getState();
+    const DebuggerState& getState() override;
-    const DebuggerState& getOldState() { return myOldState; }
+    const DebuggerState& getOldState() override { return myOldState; }
 
-    void saveOldState();
+    void saveOldState() override;
-    string toString();
+    string toString() override;
 
     /* Port A and B registers */
     uInt8 swcha(int newVal = -1);

src/debugger/TIADebug.hxx

@@ -54,11 +54,11 @@ class TIADebug : public DebuggerSystem
     TIADebug(Debugger& dbg, Console& console);
     TIA& tia() const { return myTIA; }
 
-    const DebuggerState& getState();
+    const DebuggerState& getState() override;
-    const DebuggerState& getOldState() { return myOldState; }
+    const DebuggerState& getOldState() override { return myOldState; }
 
-    void saveOldState();
+    void saveOldState() override;
-    string toString();
+    string toString() override;
 
     // TIA byte (or part of a byte) registers
     uInt8 nusiz0(int newVal = -1);

src/debugger/gui/AtariVoxWidget.hxx

@@ -32,14 +32,14 @@ class AtariVoxWidget : public ControllerWidget
                    Controller& controller);
     virtual ~AtariVoxWidget() { }
 
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     ButtonWidget* myEEPROMErase;
     enum { kEEPROMErase  = 'eeER' };
 
   private:
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     AtariVoxWidget() = delete;
     AtariVoxWidget(const AtariVoxWidget&) = delete;

src/debugger/gui/AudioWidget.hxx

@@ -43,15 +43,14 @@ class AudioWidget : public Widget, public CommandSender
       kAUDVID
     };
 
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-    void loadConfig();
-
-  private:
     DataGridWidget* myAudF;
     DataGridWidget* myAudC;
     DataGridWidget* myAudV;
 
   private:
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+    void loadConfig() override;
+
     // Following constructors and assignment operators not supported
     AudioWidget() = delete;
     AudioWidget(const AudioWidget&) = delete;

src/debugger/gui/BoosterWidget.hxx

@@ -31,9 +31,6 @@ class BoosterWidget : public ControllerWidget
                    Controller& controller);
     virtual ~BoosterWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire, kJBooster, kJTrigger };
 
@@ -41,6 +38,9 @@ class BoosterWidget : public ControllerWidget
     static Controller::DigitalPin ourPinNo[5];
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     BoosterWidget() = delete;
     BoosterWidget(const BoosterWidget&) = delete;

src/debugger/gui/Cart0840Widget.hxx

@@ -34,11 +34,6 @@ class Cartridge0840Widget : public CartDebugWidget
                         Cartridge0840& cart);
     virtual ~Cartridge0840Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     Cartridge0840& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class Cartridge0840Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     Cartridge0840Widget() = delete;
     Cartridge0840Widget(const Cartridge0840Widget&) = delete;

src/debugger/gui/Cart2KWidget.hxx

@@ -32,11 +32,11 @@ class Cartridge2KWidget : public CartDebugWidget
                       Cartridge2K& cart);
     virtual ~Cartridge2KWidget() { }
 
-    // No implementation for non-bankswitched ROMs
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
-
   private:
+    // No implementation for non-bankswitched ROMs
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
+
     // Following constructors and assignment operators not supported
     Cartridge2KWidget() = delete;
     Cartridge2KWidget(const Cartridge2KWidget&) = delete;

src/debugger/gui/Cart3EWidget.hxx

@@ -34,22 +34,6 @@ class Cartridge3EWidget : public CartDebugWidget
                       Cartridge3E& cart);
     virtual ~Cartridge3EWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     Cartridge3E& myCart;
     const uInt32 myNumRomBanks;
@@ -67,6 +51,22 @@ class Cartridge3EWidget : public CartDebugWidget
     };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     Cartridge3EWidget() = delete;
     Cartridge3EWidget(const Cartridge3EWidget&) = delete;

src/debugger/gui/Cart3FWidget.hxx

@@ -34,11 +34,6 @@ class Cartridge3FWidget : public CartDebugWidget
                       Cartridge3F& cart);
     virtual ~Cartridge3FWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     Cartridge3F& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class Cartridge3FWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     Cartridge3FWidget() = delete;
     Cartridge3FWidget(const Cartridge3FWidget&) = delete;

src/debugger/gui/Cart4A50Widget.hxx

@@ -34,11 +34,6 @@ class Cartridge4A50Widget : public CartDebugWidget
                         Cartridge4A50& cart);
     virtual ~Cartridge4A50Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     Cartridge4A50& myCart;
     PopUpWidget *myROMLower, *myRAMLower;
@@ -55,6 +50,11 @@ class Cartridge4A50Widget : public CartDebugWidget
     };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     Cartridge4A50Widget() = delete;
     Cartridge4A50Widget(const Cartridge4A50Widget&) = delete;

src/debugger/gui/Cart4KSCWidget.hxx

@@ -32,23 +32,6 @@ class Cartridge4KSCWidget : public CartDebugWidget
                       Cartridge4KSC& cart);
     virtual ~Cartridge4KSCWidget() { }
 
-    // No implementation for non-bankswitched ROMs
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
-  
-    void saveOldState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-  
   private:
     Cartridge4KSC& myCart;
     struct CartState {
@@ -57,6 +40,23 @@ class Cartridge4KSCWidget : public CartDebugWidget
     CartState myOldState; 
 
   private:
+    // No implementation for non-bankswitched ROMs
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
+  
+    void saveOldState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+  
     // Following constructors and assignment operators not supported
     Cartridge4KSCWidget() = delete;
     Cartridge4KSCWidget(const Cartridge4KSCWidget&) = delete;

src/debugger/gui/Cart4KWidget.hxx

@@ -32,11 +32,11 @@ class Cartridge4KWidget : public CartDebugWidget
                       Cartridge4K& cart);
     virtual ~Cartridge4KWidget() { }
 
-    // No implementation for non-bankswitched ROMs
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
-
   private:
+    // No implementation for non-bankswitched ROMs
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
+
     // Following constructors and assignment operators not supported
     Cartridge4KWidget() = delete;
     Cartridge4KWidget(const Cartridge4KWidget&) = delete;

src/debugger/gui/CartARWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeARWidget : public CartDebugWidget
                       CartridgeAR& cart);
     virtual ~CartridgeARWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeAR& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeARWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeARWidget() = delete;
     CartridgeARWidget(const CartridgeARWidget&) = delete;

src/debugger/gui/CartBFSCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeBFSCWidget : public CartDebugWidget
                         CartridgeBFSC& cart);
     virtual ~CartridgeBFSCWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeBFSC& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeBFSCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeBFSCWidget() = delete;
     CartridgeBFSCWidget(const CartridgeBFSCWidget&) = delete;

src/debugger/gui/CartBFWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeBFWidget : public CartDebugWidget
                       CartridgeBF& cart);
     virtual ~CartridgeBFWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeBF& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeBFWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeBFWidget() = delete;
     CartridgeBFWidget(const CartridgeBFWidget&) = delete;

src/debugger/gui/CartCMWidget.hxx

@@ -38,24 +38,6 @@ class CartridgeCMWidget : public CartDebugWidget
                       CartridgeCM& cart);
     virtual ~CartridgeCMWidget() { }
 
-    void saveOldState();
-
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     struct CartState {
       uInt8 swcha;
@@ -63,7 +45,6 @@ class CartridgeCMWidget : public CartDebugWidget
       ByteArray internalram;
     };
 
-  private:
     CartridgeCM& myCart;
     PopUpWidget* myBank;
 
@@ -79,6 +60,24 @@ class CartridgeCMWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeCMWidget() = delete;
     CartridgeCMWidget(const CartridgeCMWidget&) = delete;

src/debugger/gui/CartCTYWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeCTYWidget : public CartDebugWidget
                        CartridgeCTY& cart);
     virtual ~CartridgeCTYWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeCTY& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeCTYWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeCTYWidget() = delete;
     CartridgeCTYWidget(const CartridgeCTYWidget&) = delete;

src/debugger/gui/CartCVWidget.hxx

@@ -32,23 +32,6 @@ class CartridgeCVWidget : public CartDebugWidget
                       CartridgeCV& cart);
     virtual ~CartridgeCVWidget() { }
 
-    // No implementation for non-bankswitched ROMs
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
-  
-    void saveOldState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-  
   private:
     CartridgeCV& myCart;
     struct CartState {
@@ -57,6 +40,23 @@ class CartridgeCVWidget : public CartDebugWidget
     CartState myOldState; 
 
   private:
+    // No implementation for non-bankswitched ROMs
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
+  
+    void saveOldState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+  
     // Following constructors and assignment operators not supported
     CartridgeCVWidget() = delete;
     CartridgeCVWidget(const CartridgeCVWidget&) = delete;

src/debugger/gui/CartDASHWidget.hxx

@@ -35,22 +35,6 @@ class CartridgeDASHWidget : public CartDebugWidget
                         CartridgeDASH& cart);
     virtual ~CartridgeDASHWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     void updateUIState();
 
@@ -76,6 +60,22 @@ class CartridgeDASHWidget : public CartDebugWidget
     static const BankID bankEnum[4];
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeDASHWidget() = delete;
     CartridgeDASHWidget(const CartridgeDASHWidget&) = delete;

src/debugger/gui/CartDFSCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeDFSCWidget : public CartDebugWidget
                         CartridgeDFSC& cart);
     virtual ~CartridgeDFSCWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeDFSC& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeDFSCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeDFSCWidget() = delete;
     CartridgeDFSCWidget(const CartridgeDFSCWidget&) = delete;

src/debugger/gui/CartDFWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeDFWidget : public CartDebugWidget
                       CartridgeDF& cart);
     virtual ~CartridgeDFWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeDF& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeDFWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeDFWidget() = delete;
     CartridgeDFWidget(const CartridgeDFWidget&) = delete;

src/debugger/gui/CartDPCPlusWidget.hxx

@@ -36,23 +36,6 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
                            CartridgeDPCPlus& cart);
     virtual ~CartridgeDPCPlusWidget() { }
 
-    void saveOldState();
-
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    // end of functions for Cartridge RAM tab   
-  
   private:
     struct CartState {
       ByteArray tops;
@@ -68,7 +51,6 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
       ByteArray internalram;
     };
 
-  private:
     CartridgeDPCPlus& myCart;
     PopUpWidget* myBank;
 
@@ -90,6 +72,23 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    // end of functions for Cartridge RAM tab
+  
     // Following constructors and assignment operators not supported
     CartridgeDPCPlusWidget() = delete;
     CartridgeDPCPlusWidget(const CartridgeDPCPlusWidget&) = delete;

src/debugger/gui/CartDPCWidget.hxx

@@ -35,23 +35,6 @@ class CartridgeDPCWidget : public CartDebugWidget
                        CartridgeDPC& cart);
     virtual ~CartridgeDPCWidget() { }
 
-    void saveOldState();
-
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     struct CartState {
       ByteArray tops;
@@ -63,7 +46,6 @@ class CartridgeDPCWidget : public CartDebugWidget
       ByteArray internalram;
     };
 
-  private:
     CartridgeDPC& myCart;
     PopUpWidget* myBank;
 
@@ -79,6 +61,23 @@ class CartridgeDPCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeDPCWidget() = delete;
     CartridgeDPCWidget(const CartridgeDPCWidget&) = delete;

src/debugger/gui/CartDebugWidget.hxx

@@ -108,8 +108,8 @@ class CartDebugWidget : public Widget, public CommandSender
     // implement change tracking; most carts probably won't do anything here
     virtual void saveOldState() { }
 
-    virtual void loadConfig() { myDesc->setSelected(0); }
+    virtual void loadConfig() override { myDesc->setSelected(0); }
-    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) { };
+    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) override { };
 
     // Query internal state of the cart (usually just bankswitching info)
     virtual string bankState() { return "0 (non-bankswitched)"; }

src/debugger/gui/CartE0Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeE0Widget : public CartDebugWidget
                       CartridgeE0& cart);
     virtual ~CartridgeE0Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeE0& myCart;
     PopUpWidget *mySlice0, *mySlice1, *mySlice2;
@@ -50,6 +45,11 @@ class CartridgeE0Widget : public CartDebugWidget
     };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeE0Widget() = delete;
     CartridgeE0Widget(const CartridgeE0Widget&) = delete;

src/debugger/gui/CartE7Widget.hxx

@@ -34,22 +34,6 @@ class CartridgeE7Widget : public CartDebugWidget
                       CartridgeE7& cart);
     virtual ~CartridgeE7Widget() { }
   
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeE7& myCart;
     PopUpWidget *myLower2K, *myUpper256B;
@@ -65,6 +49,22 @@ class CartridgeE7Widget : public CartDebugWidget
     };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeE7Widget() = delete;
     CartridgeE7Widget(const CartridgeE7Widget&) = delete;

src/debugger/gui/CartEFSCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeEFSCWidget : public CartDebugWidget
                         CartridgeEFSC& cart);
     virtual ~CartridgeEFSCWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-  
   private:
     CartridgeEFSC& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeEFSCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+  
     // Following constructors and assignment operators not supported
     CartridgeEFSCWidget() = delete;
     CartridgeEFSCWidget(const CartridgeEFSCWidget&) = delete;

src/debugger/gui/CartEFWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeEFWidget : public CartDebugWidget
                       CartridgeEF& cart);
     virtual ~CartridgeEFWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeEF& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeEFWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeEFWidget() = delete;
     CartridgeEFWidget(const CartridgeEFWidget&) = delete;

src/debugger/gui/CartF0Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeF0Widget : public CartDebugWidget
                       CartridgeF0& cart);
     virtual ~CartridgeF0Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeF0& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeF0Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeF0Widget() = delete;
     CartridgeF0Widget(const CartridgeF0Widget&) = delete;

src/debugger/gui/CartF4SCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeF4SCWidget : public CartDebugWidget
                         CartridgeF4SC& cart);
     virtual ~CartridgeF4SCWidget() { }
   
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeF4SC& myCart;
     PopUpWidget* myBank;
@@ -64,6 +47,23 @@ class CartridgeF4SCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeF4SCWidget() = delete;
     CartridgeF4SCWidget(const CartridgeF4SCWidget&) = delete;

src/debugger/gui/CartF4Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeF4Widget : public CartDebugWidget
                       CartridgeF4& cart);
     virtual ~CartridgeF4Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeF4& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeF4Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeF4Widget() = delete;
     CartridgeF4Widget(const CartridgeF4Widget&) = delete;

src/debugger/gui/CartF6SCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeF6SCWidget : public CartDebugWidget
                         CartridgeF6SC& cart);
     virtual ~CartridgeF6SCWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     struct CartState {
       ByteArray internalram;
@@ -62,6 +45,23 @@ class CartridgeF6SCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeF6SCWidget() = delete;
     CartridgeF6SCWidget(const CartridgeF6SCWidget&) = delete;

src/debugger/gui/CartF6Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeF6Widget : public CartDebugWidget
                       CartridgeF6& cart);
     virtual ~CartridgeF6Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeF6& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeF6Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeF6Widget() = delete;
     CartridgeF6Widget(const CartridgeF6Widget&) = delete;

src/debugger/gui/CartF8SCWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeF8SCWidget : public CartDebugWidget
                         CartridgeF8SC& cart);
     virtual ~CartridgeF8SCWidget() { }
   
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeF8SC& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeF8SCWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeF8SCWidget() = delete;
     CartridgeF8SCWidget(const CartridgeF8SCWidget&) = delete;

src/debugger/gui/CartF8Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeF8Widget : public CartDebugWidget
                       CartridgeF8& cart);
     virtual ~CartridgeF8Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeF8& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeF8Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeF8Widget() = delete;
     CartridgeF8Widget(const CartridgeF8Widget&) = delete;

src/debugger/gui/CartFA2Widget.hxx

@@ -35,23 +35,6 @@ class CartridgeFA2Widget : public CartDebugWidget
                        CartridgeFA2& cart);
     virtual ~CartridgeFA2Widget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeFA2& myCart;
     PopUpWidget* myBank;
@@ -70,6 +53,23 @@ class CartridgeFA2Widget : public CartDebugWidget
     };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeFA2Widget() = delete;
     CartridgeFA2Widget(const CartridgeFA2Widget&) = delete;

src/debugger/gui/CartFAWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeFAWidget : public CartDebugWidget
                       CartridgeFA& cart);
     virtual ~CartridgeFAWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeFA& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeFAWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeFAWidget() = delete;
     CartridgeFAWidget(const CartridgeFAWidget&) = delete;

src/debugger/gui/CartFEWidget.hxx

@@ -32,16 +32,16 @@ class CartridgeFEWidget : public CartDebugWidget
                       CartridgeFE& cart);
     virtual ~CartridgeFEWidget() { }
 
-    // No implementation for non-bankswitched ROMs
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
-
-    string bankState();
-
   private:
     CartridgeFE& myCart;
 
   private:
+    // No implementation for non-bankswitched ROMs
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeFEWidget() = delete;
     CartridgeFEWidget(const CartridgeFEWidget&) = delete;

src/debugger/gui/CartMCWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeMCWidget : public CartDebugWidget
                       CartridgeMC& cart);
     virtual ~CartridgeMCWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeMC& myCart;
     PopUpWidget *mySlice0, *mySlice1, *mySlice2, *mySlice3;
@@ -51,6 +46,11 @@ class CartridgeMCWidget : public CartDebugWidget
     };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeMCWidget() = delete;
     CartridgeMCWidget(const CartridgeMCWidget&) = delete;

src/debugger/gui/CartMDMWidget.hxx

@@ -35,11 +35,6 @@ class CartridgeMDMWidget : public CartDebugWidget
                        CartridgeMDM& cart);
     virtual ~CartridgeMDMWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeMDM& myCart;
     PopUpWidget* myBank;
@@ -48,6 +43,11 @@ class CartridgeMDMWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH', kBankDisabled = 'bkDI' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeMDMWidget() = delete;
     CartridgeMDMWidget(const CartridgeMDMWidget&) = delete;

src/debugger/gui/CartRamWidget.hxx

@@ -47,8 +47,8 @@ class CartRamWidget : public Widget, public CommandSender
     virtual ~CartRamWidget() { };
 
   private:
-    void loadConfig();
+    void loadConfig() override;
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
     void fillGrid(bool updateOld);
   
     void showInputBox(int cmd);

src/debugger/gui/CartSBWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeSBWidget : public CartDebugWidget
                       CartridgeSB& cart);
     virtual ~CartridgeSBWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeSB& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeSBWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeSBWidget() = delete;
     CartridgeSBWidget(const CartridgeSBWidget&) = delete;

src/debugger/gui/CartUAWidget.hxx

@@ -34,11 +34,6 @@ class CartridgeUAWidget : public CartDebugWidget
                       CartridgeUA& cart);
     virtual ~CartridgeUAWidget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeUA& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeUAWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeUAWidget() = delete;
     CartridgeUAWidget(const CartridgeUAWidget&) = delete;

src/debugger/gui/CartWDWidget.hxx

@@ -34,23 +34,6 @@ class CartridgeWDWidget : public CartDebugWidget
                       CartridgeWD& cart);
     virtual ~CartridgeWDWidget() { }
 
-    void saveOldState();
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-  
-    // start of functions for Cartridge RAM tab
-    uInt32 internalRamSize();
-    uInt32 internalRamRPort(int start);
-    string internalRamDescription(); 
-    const ByteArray& internalRamOld(int start, int count);
-    const ByteArray& internalRamCurrent(int start, int count);
-    void internalRamSetValue(int addr, uInt8 value);
-    uInt8 internalRamGetValue(int addr);
-    string internalRamLabel(int addr);
-    // end of functions for Cartridge RAM tab   
-
   private:
     CartridgeWD& myCart;
     PopUpWidget* myBank;
@@ -63,6 +46,23 @@ class CartridgeWDWidget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void saveOldState() override;
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+  
+    // start of functions for Cartridge RAM tab
+    uInt32 internalRamSize() override;
+    uInt32 internalRamRPort(int start) override;
+    string internalRamDescription() override;
+    const ByteArray& internalRamOld(int start, int count) override;
+    const ByteArray& internalRamCurrent(int start, int count) override;
+    void internalRamSetValue(int addr, uInt8 value) override;
+    uInt8 internalRamGetValue(int addr) override;
+    string internalRamLabel(int addr) override;
+    // end of functions for Cartridge RAM tab
+
     // Following constructors and assignment operators not supported
     CartridgeWDWidget() = delete;
     CartridgeWDWidget(const CartridgeWDWidget&) = delete;

src/debugger/gui/CartX07Widget.hxx

@@ -34,11 +34,6 @@ class CartridgeX07Widget : public CartDebugWidget
                        CartridgeX07& cart);
     virtual ~CartridgeX07Widget() { }
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    string bankState();
-
   private:
     CartridgeX07& myCart;
     PopUpWidget* myBank;
@@ -46,6 +41,11 @@ class CartridgeX07Widget : public CartDebugWidget
     enum { kBankChanged = 'bkCH' };
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    string bankState() override;
+
     // Following constructors and assignment operators not supported
     CartridgeX07Widget() = delete;
     CartridgeX07Widget(const CartridgeX07Widget&) = delete;

src/debugger/gui/ColorWidget.hxx

@@ -43,10 +43,10 @@ class ColorWidget : public Widget, public CommandSender
     ~ColorWidget();
 
     void setColor(int color);
-    int  getColor() const    { return _color;  }
+    int  getColor() const { return _color;  }
 	
   protected:
-    void drawWidget(bool hilite);
+    void drawWidget(bool hilite) override;
 
   protected:
     int _color;

src/debugger/gui/ControllerWidget.hxx

@@ -41,13 +41,14 @@ class ControllerWidget : public Widget, public CommandSender
 
     virtual ~ControllerWidget() { };
 
-    virtual void loadConfig() { };
+    virtual void loadConfig() override { };
-    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) { };
 
   protected:
     Controller& myController;
 
   private:
+    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) override { };
+
     // Following constructors and assignment operators not supported
     ControllerWidget() = delete;
     ControllerWidget(const ControllerWidget&) = delete;

src/debugger/gui/CpuWidget.hxx

@@ -38,10 +38,10 @@ class CpuWidget : public Widget, public CommandSender
     virtual ~CpuWidget();
 
     void setOpsWidget(DataGridOpsWidget* w);
-    void loadConfig();
+    void loadConfig() override;
 
   private:
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
 
   private:
     // ID's for the various widgets

src/debugger/gui/DataGridWidget.hxx

@@ -71,36 +71,36 @@ class DataGridWidget : public EditableWidget
 
     void setRange(int lower, int upper);
 
-    bool wantsFocus() { return true; }
+    bool wantsFocus() override { return true; }
 
     // Account for the extra width of embedded scrollbar
-    int getWidth() const;
+    int getWidth() const override;
 
     int colWidth() { return _colWidth; }
 
     void setOpsWidget(DataGridOpsWidget* w) { _opsWidget = w; }
 
   protected:
-    void drawWidget(bool hilite);
+    void drawWidget(bool hilite) override;
 
     int findItem(int x, int y);
 
-    void startEditMode();
+    void startEditMode() override;
-    void endEditMode();
+    void endEditMode() override;
-    void abortEditMode();
+    void abortEditMode() override;
 
-    GUI::Rect getEditRect() const;
+    GUI::Rect getEditRect() const override;
 
-    void receivedFocusWidget();
+    void receivedFocusWidget() override;
-    void lostFocusWidget();
+    void lostFocusWidget() override;
 
-    void handleMouseDown(int x, int y, int button, int clickCount);
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
-    void handleMouseUp(int x, int y, int button, int clickCount);
+    void handleMouseUp(int x, int y, int button, int clickCount) override;
-    void handleMouseWheel(int x, int y, int direction);
+    void handleMouseWheel(int x, int y, int direction) override;
-    bool handleText(char text);
+    bool handleText(char text) override;
-    bool handleKeyDown(StellaKey key, StellaMod mod);
+    bool handleKeyDown(StellaKey key, StellaMod mod) override;
-    bool handleKeyUp(StellaKey key, StellaMod mod);
+    bool handleKeyUp(StellaKey key, StellaMod mod) override;
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
 
   protected:
     int  _rows;

src/debugger/gui/DebuggerDialog.hxx

@@ -68,9 +68,9 @@ class DebuggerDialog : public Dialog
     void showFatalMessage(const string& msg);
 
   private:
-    void loadConfig();
+    void loadConfig() override;
-    void handleKeyDown(StellaKey key, StellaMod mod);
+    void handleKeyDown(StellaKey key, StellaMod mod) override;
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
 
     void doStep();
     void doTrace();

src/debugger/gui/DrivingWidget.hxx

@@ -35,9 +35,6 @@ class DrivingWidget : public ControllerWidget
                   Controller& controller);
     virtual ~DrivingWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     enum {
       kGreyUpCmd   = 'DWup',
@@ -53,6 +50,9 @@ class DrivingWidget : public ControllerWidget
     static uInt8 ourGreyTable[4];
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     DrivingWidget() = delete;
     DrivingWidget(const DrivingWidget&) = delete;

src/debugger/gui/GenesisWidget.hxx

@@ -31,9 +31,6 @@ class GenesisWidget : public ControllerWidget
                   Controller& controller);
     virtual ~GenesisWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJBbtn, kJCbtn };
 
@@ -41,6 +38,9 @@ class GenesisWidget : public ControllerWidget
     static Controller::DigitalPin ourPinNo[5];
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     GenesisWidget() = delete;
     GenesisWidget(const GenesisWidget&) = delete;

src/debugger/gui/JoystickWidget.hxx

@@ -31,9 +31,6 @@ class JoystickWidget : public ControllerWidget
                    Controller& controller);
     virtual ~JoystickWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire };
 
@@ -41,6 +38,9 @@ class JoystickWidget : public ControllerWidget
     static Controller::DigitalPin ourPinNo[5];
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     JoystickWidget() = delete;
     JoystickWidget(const JoystickWidget&) = delete;

src/debugger/gui/KeyboardWidget.hxx

@@ -31,9 +31,6 @@ class KeyboardWidget : public ControllerWidget
                    Controller& controller);
     virtual ~KeyboardWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     CheckboxWidget* myBox[12];
     Event::Type* myEvent;
@@ -41,6 +38,9 @@ class KeyboardWidget : public ControllerWidget
     static Event::Type ourLeftEvents[12], ourRightEvents[12];
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     KeyboardWidget() = delete;
     KeyboardWidget(const KeyboardWidget&) = delete;

src/debugger/gui/PaddleWidget.hxx

@@ -31,9 +31,6 @@ class PaddleWidget : public ControllerWidget
                  Controller& controller);
     virtual ~PaddleWidget();
 
-    void loadConfig();
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     enum { kP0Changed = 'P0ch', kP1Changed = 'P1ch',
            kP0Fire = 'P0fr', kP1Fire = 'P1fr' };
@@ -42,6 +39,9 @@ class PaddleWidget : public ControllerWidget
     CheckboxWidget *myP0Fire, *myP1Fire;
 
   private:
+    void loadConfig() override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     PaddleWidget() = delete;
     PaddleWidget(const PaddleWidget&) = delete;

src/debugger/gui/PromptWidget.hxx

@@ -48,7 +48,7 @@ class PromptWidget : public Widget, public CommandSender
   protected:
     int& buffer(int idx) { return _buffer[idx % kBufferSize]; }
 
-    void drawWidget(bool hilite);
+    void drawWidget(bool hilite) override;
     void drawCaret();
     void putcharIntern(int c);
 //    void insertIntoPrompt(const char *str);
@@ -66,18 +66,18 @@ class PromptWidget : public Widget, public CommandSender
     void addToHistory(const char *str);
     void historyScroll(int direction);
 
-    void handleMouseDown(int x, int y, int button, int clickCount);
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
-    void handleMouseWheel(int x, int y, int direction);
+    void handleMouseWheel(int x, int y, int direction) override;
-    bool handleText(char text);
+    bool handleText(char text) override;
-    bool handleKeyDown(StellaKey key, StellaMod mod);
+    bool handleKeyDown(StellaKey key, StellaMod mod) override;
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
 
     // Account for the extra width of embedded scrollbar
-    virtual int getWidth() const;
+    virtual int getWidth() const override;
 
     virtual bool wantsFocus() { return true; }
 
-    void loadConfig();
+    void loadConfig() override;
 
   private:
     // Get the longest prefix (initially 's') that is in every string in the list

src/debugger/gui/RamWidget.hxx

@@ -37,9 +37,7 @@ class RamWidget : public Widget, public CommandSender
               int x, int y);
     virtual ~RamWidget();
 
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void loadConfig() override;
-
-    void loadConfig();
     void setOpsWidget(DataGridOpsWidget* w);
 
   private:
@@ -51,6 +49,8 @@ class RamWidget : public Widget, public CommandSender
     void doRestart();
     void showSearchResults();
 
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
   private:
     enum {
       kUndoCmd     = 'RWud',

src/debugger/gui/RiotWidget.hxx

@@ -37,15 +37,15 @@ class RiotWidget : public Widget, public CommandSender
                int x, int y, int w, int h);
     virtual ~RiotWidget();
 
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-    void loadConfig();
-
   private:
     ControllerWidget* addControlWidget(GuiObject* boss, const GUI::Font& font,
         int x, int y, Controller& controller);
 
     void handleRandomCPU();
 
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+    void loadConfig() override;
+
   private:
     ToggleBitWidget* mySWCHAReadBits;
     ToggleBitWidget* mySWCHAWriteBits;

src/debugger/gui/RomListSettings.hxx

@@ -41,12 +41,7 @@ class RomListSettings : public Dialog, public CommandSender
     void show(uInt32 x, uInt32 y, int data = -1);
 
     /** This dialog uses its own positioning, so we override Dialog::center() */
-    void center();
+    void center() override;
-
-  private:
-    void loadConfig();
-    void handleMouseDown(int x, int y, int button, int clickCount);
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
 
   private:
     uInt32 _xorig, _yorig;
@@ -58,6 +53,10 @@ class RomListSettings : public Dialog, public CommandSender
     CheckboxWidget* myUseRelocation;
 
   private:
+    void loadConfig() override;
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     RomListSettings() = delete;
     RomListSettings(const RomListSettings&) = delete;

src/debugger/gui/RomListWidget.hxx

@@ -60,26 +60,26 @@ class RomListWidget : public EditableWidget
     void setHighlighted(int item);
 
   protected:
-    void handleMouseDown(int x, int y, int button, int clickCount);
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
-    void handleMouseUp(int x, int y, int button, int clickCount);
+    void handleMouseUp(int x, int y, int button, int clickCount) override;
-    void handleMouseWheel(int x, int y, int direction);
+    void handleMouseWheel(int x, int y, int direction) override;
-    bool handleText(char text);
+    bool handleText(char text) override;
-    bool handleKeyDown(StellaKey key, StellaMod mod);
+    bool handleKeyDown(StellaKey key, StellaMod mod) override;
-    bool handleKeyUp(StellaKey key, StellaMod mod);
+    bool handleKeyUp(StellaKey key, StellaMod mod) override;
-    bool handleEvent(Event::Type e);
+    bool handleEvent(Event::Type e) override;
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
 
-    void drawWidget(bool hilite);
+    void drawWidget(bool hilite) override;
     GUI::Rect getLineRect() const;
-    GUI::Rect getEditRect() const;
+    GUI::Rect getEditRect() const override;
 
     int findItem(int x, int y) const;
     void recalc();
 
-    void startEditMode();
+    void startEditMode() override;
-    void endEditMode();
+    void endEditMode() override;
-    void abortEditMode();
+    void abortEditMode() override;
-    void lostFocusWidget();
+    void lostFocusWidget() override;
     void scrollToSelected()    { scrollToCurrent(_selectedItem);    }
     void scrollToHighlighted() { scrollToCurrent(_highlightedItem); }
 

src/debugger/gui/RomWidget.hxx

@@ -44,10 +44,11 @@ class RomWidget : public Widget, public CommandSender
     { myListIsDirty = true; if(forcereload) loadConfig(); }
 
     void scrollTo(int line) { myRomList->setSelected(line); }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-    void loadConfig();
 
   private:
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+    void loadConfig() override;
+
     void setBreak(int disasm_line, bool state);
     void setPC(int disasm_line);
     void runtoPC(int disasm_line);

src/debugger/gui/SaveKeyWidget.hxx

@@ -32,14 +32,14 @@ class SaveKeyWidget : public ControllerWidget
                   Controller& controller);
     virtual ~SaveKeyWidget() { }
 
-    void loadConfig() { }
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
   private:
     ButtonWidget* myEEPROMErase;
     enum { kEEPROMErase  = 'eeER' };
 
   private:
+    void loadConfig() override { }
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     SaveKeyWidget() = delete;
     SaveKeyWidget(const SaveKeyWidget&) = delete;

src/debugger/gui/TiaInfoWidget.hxx

@@ -34,11 +34,7 @@ class TiaInfoWidget : public Widget, public CommandSender
                   int x, int y, int max_w);
     virtual ~TiaInfoWidget();
 
-    void loadConfig();
+    void loadConfig() override;
-
-  protected:
-    void handleMouseDown(int x, int y, int button, int clickCount);
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
 
   private:
     EditTextWidget* myFrameCount;
@@ -53,6 +49,9 @@ class TiaInfoWidget : public Widget, public CommandSender
     CheckboxWidget* myVBlank;
 
   private:
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     TiaInfoWidget() = delete;
     TiaInfoWidget(const TiaInfoWidget&) = delete;

src/debugger/gui/TiaOutputWidget.hxx

@@ -36,7 +36,7 @@ class TiaOutputWidget : public Widget, public CommandSender
                     int x, int y, int w, int h);
     virtual ~TiaOutputWidget();
 
-    void loadConfig();
+    void loadConfig() override;
     void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
 
     void saveSnapshot();
@@ -45,19 +45,11 @@ class TiaOutputWidget : public Widget, public CommandSender
 // For example, clicking an area may cause an action
 // (fill to this scanline, etc).
 /*
-    virtual void handleMouseUp(int x, int y, int button, int clickCount);
+    virtual void handleMouseUp(int x, int y, int button, int clickCount) override;
-    virtual void handleMouseWheel(int x, int y, int direction);
+    virtual void handleMouseWheel(int x, int y, int direction) override;
-    virtual bool handleKeyDown(StellaKey key, StellaMod mod);
+    virtual bool handleKeyDown(StellaKey key, StellaMod mod) override;
-    virtual bool handleKeyUp(StellaKey key, StellaMod mod);
+    virtual bool handleKeyUp(StellaKey key, StellaMod mod) override;
 */
-
-  protected:
-    void handleMouseDown(int x, int y, int button, int clickCount);
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    void drawWidget(bool hilite);
-    bool wantsFocus() { return false; }
-
   private:
     unique_ptr<ContextMenu> myMenu;
     TiaZoomWidget* myZoom;
@@ -69,6 +61,12 @@ class TiaOutputWidget : public Widget, public CommandSender
     uInt32 myLineBuffer[320];
 
   private:
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    void drawWidget(bool hilite) override;
+    bool wantsFocus() { return false; }
+
     // Following constructors and assignment operators not supported
     TiaOutputWidget() = delete;
     TiaOutputWidget(const TiaOutputWidget&) = delete;

src/debugger/gui/TiaWidget.hxx

@@ -39,12 +39,6 @@ class TiaWidget : public Widget, public CommandSender
               int x, int y, int w, int h);
     virtual ~TiaWidget();
 
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-    void loadConfig();
-
-  private:
-    void changeColorRegs();
-
   private:
     DataGridWidget* myColorRegs;
 
@@ -149,6 +143,10 @@ class TiaWidget : public Widget, public CommandSender
     };
 
   private:
+    void changeColorRegs();
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+    void loadConfig() override;
+
     // Following constructors and assignment operators not supported
     TiaWidget() = delete;
     TiaWidget(const TiaWidget&) = delete;

src/debugger/gui/TiaZoomWidget.hxx

@@ -34,25 +34,24 @@ class TiaZoomWidget : public Widget, public CommandSender
                   int x, int y, int w, int h);
     virtual ~TiaZoomWidget();
 
-    void loadConfig();
+    void loadConfig() override;
     void setPos(int x, int y);
 
-  protected:
-    void handleMouseDown(int x, int y, int button, int clickCount);
-    void handleMouseUp(int x, int y, int button, int clickCount);
-    void handleMouseWheel(int x, int y, int direction);
-    void handleMouseMoved(int x, int y, int button);
-    void handleMouseLeft(int button);
-    bool handleEvent(Event::Type event);
-    void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
-    void drawWidget(bool hilite);
-    bool wantsFocus() { return true; }
-
   private:
     void zoom(int level);
     void recalc();
 
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
+    void handleMouseUp(int x, int y, int button, int clickCount) override;
+    void handleMouseWheel(int x, int y, int direction) override;
+    void handleMouseMoved(int x, int y, int button) override;
+    void handleMouseLeft(int button) override;
+    bool handleEvent(Event::Type event) override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+    void drawWidget(bool hilite) override;
+    bool wantsFocus() { return true; }
+
   private:
     unique_ptr<ContextMenu> myMenu;
 

src/debugger/gui/ToggleBitWidget.hxx

@@ -34,7 +34,7 @@ class ToggleBitWidget : public ToggleWidget
     void setState(const BoolArray& state, const BoolArray& changed);
 
   protected:
-    void drawWidget(bool hilite);
+    void drawWidget(bool hilite) override;
 
   protected:
     StringList  _offList;

src/debugger/gui/TogglePixelWidget.hxx

@@ -41,14 +41,13 @@ class TogglePixelWidget : public ToggleWidget
     void setIntState(int value, bool swap);
     int  getIntState();
 
-  protected:
-    void drawWidget(bool hilite);
-
   private:
     int  _pixelColor, _backgroundColor;
     bool _swapBits;
 
   private:
+    void drawWidget(bool hilite) override;
+
     // Following constructors and assignment operators not supported
     TogglePixelWidget() = delete;
     TogglePixelWidget(const TogglePixelWidget&) = delete;

src/debugger/gui/ToggleWidget.hxx

@@ -41,19 +41,12 @@ class ToggleWidget : public Widget, public CommandSender
     const BoolArray& getState()    { return _stateList; }
     bool getSelectedState() const  { return _stateList[_selectedItem]; }
 
-    virtual void handleMouseDown(int x, int y, int button, int clickCount);
-    virtual void handleMouseUp(int x, int y, int button, int clickCount);
-    virtual bool handleKeyDown(StellaKey key, StellaMod mod);
-    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id);
-
     virtual bool wantsFocus() { return true; }
 
     int colWidth() const { return _colWidth; }
     void setEditable(bool editable) { _editable = editable; }
 
   protected:
-    void drawWidget(bool hilite) = 0;
-    int findItem(int x, int y);
 
   protected:
     int  _rows;
@@ -69,6 +62,14 @@ class ToggleWidget : public Widget, public CommandSender
     BoolArray  _changedList;
 
   private:
+    void drawWidget(bool hilite) override = 0;
+    int findItem(int x, int y);
+
+    void handleMouseDown(int x, int y, int button, int clickCount) override;
+    void handleMouseUp(int x, int y, int button, int clickCount) override;
+    bool handleKeyDown(StellaKey key, StellaMod mod) override;
+    void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
     // Following constructors and assignment operators not supported
     ToggleWidget() = delete;
     ToggleWidget(const ToggleWidget&) = delete;

src/emucore/AtariVox.hxx

@@ -68,7 +68,7 @@ class AtariVox : public Controller
       @param pin The pin of the controller jack to read
       @return The state of the pin
     */
-    bool read(DigitalPin pin);
+    bool read(DigitalPin pin) override;
 
     /**
       Write the given value to the specified digital pin for this
@@ -78,22 +78,22 @@ class AtariVox : public Controller
       @param pin The pin of the controller jack to write to
       @param value The value to write to the pin
     */
-    void write(DigitalPin pin, bool value);
+    void write(DigitalPin pin, bool value) override;
 
     /**
       Update the entire digital and analog pin state according to the
       events currently set.
     */
-    void update() { }
+    void update() override { }
 
     /**
       Notification method invoked by the system right before the
       system resets its cycle counter to zero.  It may be necessary 
       to override this method for devices that remember cycle counts.
     */
-    void systemCyclesReset();
+    void systemCyclesReset() override;
 
-    string about() const;
+    string about() const override;
 
   private:
    void clockDataIn(bool value);

src/emucore/Booster.hxx

@@ -53,7 +53,7 @@ class BoosterGrip : public Controller
       Update the entire digital and analog pin state according to the
       events currently set.
     */
-    void update();
+    void update() override;
 
     /**
       Determines how this controller will treat values received from the
@@ -72,7 +72,7 @@ class BoosterGrip : public Controller
       @return  Whether the controller supports using the mouse
     */
     bool setMouseControl(
-      Controller::Type xtype, int xid, Controller::Type ytype, int yid);
+      Controller::Type xtype, int xid, Controller::Type ytype, int yid) override;
 
   private:
     // Pre-compute the events we care about based on given port

src/emucore/Cart.cxx

@@ -316,7 +316,7 @@ Cartridge::~Cartridge()
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool Cartridge::save(ofstream& out)
+bool Cartridge::saveROM(ofstream& out)
 {
   int size = -1;
 

src/emucore/Cart.hxx

@@ -87,7 +87,7 @@ class Cartridge : public Device
 
       @param out  The output file stream to save the image
     */
-    bool save(ofstream& out);
+    bool saveROM(ofstream& out);
 
     /**
       Lock/unlock bankswitching capability.  The debugger will lock
@@ -171,29 +171,6 @@ class Cartridge : public Device
     */
     virtual const uInt8* getImage(int& size) const = 0;
 
-    /**
-      Save the current state of this device to the given Serializer.
-
-      @param out  The Serializer object to use
-      @return  False on any errors, else true
-    */
-    virtual bool save(Serializer& out) const = 0;
-
-    /**
-      Load the current state of this device from the given Serializer.
-
-      @param in  The Serializer object to use
-      @return  False on any errors, else true
-    */
-    virtual bool load(Serializer& in) = 0;
-
-    /**
-      Get a descriptor for the device name (used in error checking).
-
-      @return The name of the object
-    */
-    virtual string name() const = 0;
-
     /**
       Informs the cartridge about the name of the ROM file used when
       creating this cart.

src/emucore/Cart0840.hxx

@@ -56,7 +56,7 @@ class Cartridge0840 : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -64,24 +64,24 @@ class Cartridge0840 : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -90,7 +90,7 @@ class Cartridge0840 : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -98,7 +98,7 @@ class Cartridge0840 : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -106,7 +106,7 @@ class Cartridge0840 : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -114,14 +114,14 @@ class Cartridge0840 : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge0840"; }
+    string name() const override { return "Cartridge0840"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -129,7 +129,7 @@ class Cartridge0840 : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge0840Widget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -141,7 +141,7 @@ class Cartridge0840 : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -150,7 +150,7 @@ class Cartridge0840 : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // The 8K ROM image of the cartridge

src/emucore/Cart2K.hxx

@@ -59,7 +59,7 @@ class Cartridge2K : public Cartridge
     /**
       Reset cartridge to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -67,7 +67,7 @@ class Cartridge2K : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Patch the cartridge ROM.
@@ -76,7 +76,7 @@ class Cartridge2K : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -84,7 +84,7 @@ class Cartridge2K : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -92,7 +92,7 @@ class Cartridge2K : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -100,14 +100,14 @@ class Cartridge2K : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge2K"; }
+    string name() const override { return "Cartridge2K"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -115,7 +115,7 @@ class Cartridge2K : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge2KWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -127,7 +127,7 @@ class Cartridge2K : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -136,7 +136,7 @@ class Cartridge2K : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Pointer to a dynamically allocated ROM image of the cartridge

src/emucore/Cart3E.hxx

@@ -87,7 +87,7 @@ class Cartridge3E : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -95,24 +95,24 @@ class Cartridge3E : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -121,7 +121,7 @@ class Cartridge3E : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -129,7 +129,7 @@ class Cartridge3E : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -137,7 +137,7 @@ class Cartridge3E : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -145,14 +145,14 @@ class Cartridge3E : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge3E"; }
+    string name() const override { return "Cartridge3E"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -160,7 +160,7 @@ class Cartridge3E : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge3EWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -172,7 +172,7 @@ class Cartridge3E : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -181,7 +181,7 @@ class Cartridge3E : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Indicates which bank is currently active for the first segment

src/emucore/Cart3F.hxx

@@ -64,7 +64,7 @@ class Cartridge3F : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -72,24 +72,24 @@ class Cartridge3F : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -98,7 +98,7 @@ class Cartridge3F : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -106,7 +106,7 @@ class Cartridge3F : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -114,7 +114,7 @@ class Cartridge3F : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -122,14 +122,14 @@ class Cartridge3F : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge3F"; }
+    string name() const override { return "Cartridge3F"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -137,7 +137,7 @@ class Cartridge3F : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge3FWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -149,7 +149,7 @@ class Cartridge3F : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -158,7 +158,7 @@ class Cartridge3F : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Indicates which bank is currently active for the first segment

src/emucore/Cart4A50.hxx

@@ -72,7 +72,7 @@ class Cartridge4A50 : public Cartridge
     /**
       Reset cartridge to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -80,7 +80,7 @@ class Cartridge4A50 : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Patch the cartridge ROM.
@@ -89,7 +89,7 @@ class Cartridge4A50 : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -97,7 +97,7 @@ class Cartridge4A50 : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -105,7 +105,7 @@ class Cartridge4A50 : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -113,14 +113,14 @@ class Cartridge4A50 : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge4A50"; }
+    string name() const override { return "Cartridge4A50"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -128,7 +128,7 @@ class Cartridge4A50 : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge4A50Widget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -140,7 +140,7 @@ class Cartridge4A50 : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -149,7 +149,7 @@ class Cartridge4A50 : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     /**
@@ -158,8 +158,8 @@ class Cartridge4A50 : public Cartridge
       @param address The address to modify
       @param flags A bitfield of DisasmType directives for the given address
     */
-    uInt8 getAccessFlags(uInt16 address) const;
+    uInt8 getAccessFlags(uInt16 address) const override;
-    void setAccessFlags(uInt16 address, uInt8 flags);
+    void setAccessFlags(uInt16 address, uInt8 flags) override;
 
     /**
       Check all possible hotspots

src/emucore/Cart4K.hxx

@@ -58,7 +58,7 @@ class Cartridge4K : public Cartridge
     /**
       Reset cartridge to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -66,7 +66,7 @@ class Cartridge4K : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Patch the cartridge ROM.
@@ -75,7 +75,7 @@ class Cartridge4K : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -83,7 +83,7 @@ class Cartridge4K : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -91,7 +91,7 @@ class Cartridge4K : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -99,14 +99,14 @@ class Cartridge4K : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge4K"; }
+    string name() const override { return "Cartridge4K"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -114,7 +114,7 @@ class Cartridge4K : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge4KWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -126,7 +126,7 @@ class Cartridge4K : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -135,7 +135,7 @@ class Cartridge4K : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // The 4K ROM image for the cartridge

src/emucore/Cart4KSC.hxx

@@ -56,7 +56,7 @@ class Cartridge4KSC : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -64,7 +64,7 @@ class Cartridge4KSC : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Patch the cartridge ROM.
@@ -73,7 +73,7 @@ class Cartridge4KSC : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -81,7 +81,7 @@ class Cartridge4KSC : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -89,7 +89,7 @@ class Cartridge4KSC : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -97,14 +97,14 @@ class Cartridge4KSC : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "Cartridge4KSC"; }
+    string name() const override { return "Cartridge4KSC"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -112,7 +112,7 @@ class Cartridge4KSC : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new Cartridge4KSCWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -124,7 +124,7 @@ class Cartridge4KSC : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -133,7 +133,7 @@ class Cartridge4KSC : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Indicates which bank is currently active

src/emucore/CartAR.hxx

@@ -63,14 +63,14 @@ class CartridgeAR : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Notification method invoked by the system right before the
       system resets its cycle counter to zero.  It may be necessary
       to override this method for devices that remember cycle counts.
     */
-    void systemCyclesReset();
+    void systemCyclesReset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -78,24 +78,24 @@ class CartridgeAR : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -104,7 +104,7 @@ class CartridgeAR : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -112,7 +112,7 @@ class CartridgeAR : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -120,7 +120,7 @@ class CartridgeAR : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -128,14 +128,14 @@ class CartridgeAR : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeAR"; }
+    string name() const override { return "CartridgeAR"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -143,7 +143,7 @@ class CartridgeAR : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeARWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -155,7 +155,7 @@ class CartridgeAR : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -164,7 +164,7 @@ class CartridgeAR : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     /**
@@ -173,8 +173,8 @@ class CartridgeAR : public Cartridge
       @param address The address to modify
       @param flags A bitfield of DisasmType directives for the given address
     */
-    uInt8 getAccessFlags(uInt16 address) const;
+    uInt8 getAccessFlags(uInt16 address) const override;
-    void setAccessFlags(uInt16 address, uInt8 flags);
+    void setAccessFlags(uInt16 address, uInt8 flags) override;
 
     // Handle a change to the bank configuration
     bool bankConfiguration(uInt8 configuration);

src/emucore/CartBF.hxx

@@ -59,7 +59,7 @@ class CartridgeBF : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -67,24 +67,24 @@ class CartridgeBF : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -93,7 +93,7 @@ class CartridgeBF : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -101,7 +101,7 @@ class CartridgeBF : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -109,7 +109,7 @@ class CartridgeBF : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -117,14 +117,14 @@ class CartridgeBF : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeBF"; }
+    string name() const override { return "CartridgeBF"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -132,7 +132,7 @@ class CartridgeBF : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeBFWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -144,7 +144,7 @@ class CartridgeBF : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -153,7 +153,7 @@ class CartridgeBF : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Indicates which bank is currently active

src/emucore/CartBFSC.hxx

@@ -58,7 +58,7 @@ class CartridgeBFSC : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -66,24 +66,24 @@ class CartridgeBFSC : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -92,7 +92,7 @@ class CartridgeBFSC : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -100,7 +100,7 @@ class CartridgeBFSC : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -108,7 +108,7 @@ class CartridgeBFSC : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -116,14 +116,14 @@ class CartridgeBFSC : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeBFSC"; }
+    string name() const override { return "CartridgeBFSC"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -131,7 +131,7 @@ class CartridgeBFSC : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeBFSCWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -143,7 +143,7 @@ class CartridgeBFSC : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -152,7 +152,7 @@ class CartridgeBFSC : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Indicates which bank is currently active

src/emucore/CartCM.hxx

@@ -130,7 +130,7 @@ class CartridgeCM : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -138,24 +138,24 @@ class CartridgeCM : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -164,7 +164,7 @@ class CartridgeCM : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -172,7 +172,7 @@ class CartridgeCM : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -180,7 +180,7 @@ class CartridgeCM : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -188,14 +188,14 @@ class CartridgeCM : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeCM"; }
+    string name() const override { return "CartridgeCM"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -203,7 +203,7 @@ class CartridgeCM : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeCMWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -215,7 +215,7 @@ class CartridgeCM : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -224,7 +224,7 @@ class CartridgeCM : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
     /**
       Inform the cartridge about the parent CompuMate controller

src/emucore/CartCTY.hxx

@@ -133,14 +133,14 @@ class CartridgeCTY : public Cartridge
     /**
       Reset device to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Notification method invoked by the system right before the
       system resets its cycle counter to zero.  It may be necessary
       to override this method for devices that remember cycle counts.
     */
-    void systemCyclesReset();
+    void systemCyclesReset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -148,24 +148,24 @@ class CartridgeCTY : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Install pages for the specified bank in the system.
 
       @param bank The bank that should be installed in the system
     */
-    bool bank(uInt16 bank);
+    bool bank(uInt16 bank) override;
 
     /**
       Get the current bank.
     */
-    uInt16 getBank() const;
+    uInt16 getBank() const override;
 
     /**
       Query the number of banks supported by the cartridge.
     */
-    uInt16 bankCount() const;
+    uInt16 bankCount() const override;
 
     /**
       Patch the cartridge ROM.
@@ -174,7 +174,7 @@ class CartridgeCTY : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -182,7 +182,7 @@ class CartridgeCTY : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -190,7 +190,7 @@ class CartridgeCTY : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -198,14 +198,14 @@ class CartridgeCTY : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeCTY"; }
+    string name() const override { return "CartridgeCTY"; }
 
     /**
       Informs the cartridge about the name of the ROM file used when
@@ -213,7 +213,7 @@ class CartridgeCTY : public Cartridge
 
       @param name  The properties file name of the ROM
     */
-    void setRomName(const string& name);
+    void setRomName(const string& name) override;
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -221,7 +221,7 @@ class CartridgeCTY : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeCTYWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -233,7 +233,7 @@ class CartridgeCTY : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -242,7 +242,7 @@ class CartridgeCTY : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     /**

src/emucore/CartCV.hxx

@@ -61,7 +61,7 @@ class CartridgeCV : public Cartridge
     /**
       Reset cartridge to its power-on state
     */
-    void reset();
+    void reset() override;
 
     /**
       Install cartridge in the specified system.  Invoked by the system
@@ -69,7 +69,7 @@ class CartridgeCV : public Cartridge
 
       @param system The system the device should install itself in
     */
-    void install(System& system);
+    void install(System& system) override;
 
     /**
       Patch the cartridge ROM.
@@ -78,7 +78,7 @@ class CartridgeCV : public Cartridge
       @param value    The value to place into the address
       @return    Success or failure of the patch operation
     */
-    bool patch(uInt16 address, uInt8 value);
+    bool patch(uInt16 address, uInt8 value) override;
 
     /**
       Access the internal ROM image for this cartridge.
@@ -86,7 +86,7 @@ class CartridgeCV : public Cartridge
       @param size  Set to the size of the internal ROM image data
       @return  A pointer to the internal ROM image data
     */
-    const uInt8* getImage(int& size) const;
+    const uInt8* getImage(int& size) const override;
 
     /**
       Save the current state of this cart to the given Serializer.
@@ -94,7 +94,7 @@ class CartridgeCV : public Cartridge
       @param out  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool save(Serializer& out) const;
+    bool save(Serializer& out) const override;
 
     /**
       Load the current state of this cart from the given Serializer.
@@ -102,14 +102,14 @@ class CartridgeCV : public Cartridge
       @param in  The Serializer object to use
       @return  False on any errors, else true
     */
-    bool load(Serializer& in);
+    bool load(Serializer& in) override;
 
     /**
       Get a descriptor for the device name (used in error checking).
 
       @return The name of the object
     */
-    string name() const { return "CartridgeCV"; }
+    string name() const override { return "CartridgeCV"; }
 
   #ifdef DEBUGGER_SUPPORT
     /**
@@ -117,7 +117,7 @@ class CartridgeCV : public Cartridge
       of the cart.
     */
     CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-        const GUI::Font& nfont, int x, int y, int w, int h)
+        const GUI::Font& nfont, int x, int y, int w, int h) override
     {
       return new CartridgeCVWidget(boss, lfont, nfont, x, y, w, h, *this);
     }
@@ -129,7 +129,7 @@ class CartridgeCV : public Cartridge
 
       @return The byte at the specified address
     */
-    uInt8 peek(uInt16 address);
+    uInt8 peek(uInt16 address) override;
 
     /**
       Change the byte at the specified address to the given value
@@ -138,7 +138,7 @@ class CartridgeCV : public Cartridge
       @param value The value to be stored at the address
       @return  True if the poke changed the device address space, else false
     */
-    bool poke(uInt16 address, uInt8 value);
+    bool poke(uInt16 address, uInt8 value) override;
 
   private:
     // Pointer to the initial RAM data from the cart

src/emucore/CartDASH.hxx

@@ -147,7 +147,7 @@ public:
   /**
    Reset device to its power-on state
    */
-  void reset();
+  void reset() override;
 
   /**
    Install cartridge in the specified system.  Invoked by the system
@@ -155,7 +155,7 @@ public:
 
    @param system The system the device should install itself in
    */
-  void install(System& system);
+  void install(System& system) override;
 
   /**
    Patch the cartridge ROM.
@@ -164,7 +164,7 @@ public:
    @param value    The value to place into the address
    @return    Success or failure of the patch operation
    */
-  bool patch(uInt16 address, uInt8 value);
+  bool patch(uInt16 address, uInt8 value) override;
 
   /**
    Access the internal ROM image for this cartridge.
@@ -172,7 +172,7 @@ public:
    @param size  Set to the size of the internal ROM image data
    @return  A pointer to the internal ROM image data
    */
-  const uInt8* getImage(int& size) const;
+  const uInt8* getImage(int& size) const override;
 
   /**
    Save the current state of this cart to the given Serializer.
@@ -180,7 +180,7 @@ public:
    @param out  The Serializer object to use
    @return  False on any errors, else true
    */
-  bool save(Serializer& out) const;
+  bool save(Serializer& out) const override;
 
   /**
    Load the current state of this cart from the given Serializer.
@@ -188,16 +188,14 @@ public:
    @param in  The Serializer object to use
    @return  False on any errors, else true
    */
-  bool load(Serializer& in);
+  bool load(Serializer& in) override;
 
   /**
    Get a descriptor for the device name (used in error checking).
 
    @return The name of the object
    */
-  string name() const {
+  string name() const override { return "CartridgeDASH"; }
-    return "CartridgeDASH";
-  }
 
 #ifdef DEBUGGER_SUPPORT
   /**
@@ -205,7 +203,7 @@ public:
    of the cart.
    */
   CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-      const GUI::Font& nfont, int x, int y, int w, int h)
+      const GUI::Font& nfont, int x, int y, int w, int h) override
   {
     return new CartridgeDASHWidget(boss, lfont, nfont, x, y, w, h, *this);
   }
@@ -217,7 +215,7 @@ public:
 
    @return The byte at the specified address
    */
-  uInt8 peek(uInt16 address);
+  uInt8 peek(uInt16 address) override;
 
   /**
    Change the byte at the specified address to the given value
@@ -226,7 +224,7 @@ public:
    @param value    The value to be stored at the address
    @return         True if the poke changed the device address space, else false
    */
-  bool poke(uInt16 address, uInt8 value);
+  bool poke(uInt16 address, uInt8 value) override;
 
 private: