From f279eac86fe46a57ff109e127df9f7d99fae63b4 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Tue, 29 Dec 2015 22:39:08 +0000
Subject: [PATCH] Updated C++11 "= default" for destructors in src/debugger
 classes.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3242 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/debugger/CartDebug.cxx             | 5 -----
 src/debugger/CartDebug.hxx             | 2 +-
 src/debugger/DebuggerSystem.hxx        | 6 +++---
 src/debugger/DiStella.cxx              | 5 -----
 src/debugger/DiStella.hxx              | 2 --
 src/debugger/Expression.hxx            | 2 +-
 src/debugger/gui/AtariVoxWidget.hxx    | 2 +-
 src/debugger/gui/AudioWidget.cxx       | 5 -----
 src/debugger/gui/AudioWidget.hxx       | 2 +-
 src/debugger/gui/BoosterWidget.cxx     | 5 -----
 src/debugger/gui/BoosterWidget.hxx     | 2 +-
 src/debugger/gui/Cart0840Widget.hxx    | 2 +-
 src/debugger/gui/Cart2KWidget.hxx      | 2 +-
 src/debugger/gui/Cart3EWidget.hxx      | 2 +-
 src/debugger/gui/Cart3FWidget.hxx      | 2 +-
 src/debugger/gui/Cart4A50Widget.hxx    | 2 +-
 src/debugger/gui/Cart4KSCWidget.hxx    | 2 +-
 src/debugger/gui/Cart4KWidget.hxx      | 2 +-
 src/debugger/gui/CartARWidget.hxx      | 2 +-
 src/debugger/gui/CartBFSCWidget.hxx    | 2 +-
 src/debugger/gui/CartBFWidget.hxx      | 2 +-
 src/debugger/gui/CartCMWidget.hxx      | 2 +-
 src/debugger/gui/CartCTYWidget.hxx     | 2 +-
 src/debugger/gui/CartCVWidget.hxx      | 2 +-
 src/debugger/gui/CartDASHWidget.hxx    | 2 +-
 src/debugger/gui/CartDFSCWidget.hxx    | 2 +-
 src/debugger/gui/CartDFWidget.hxx      | 2 +-
 src/debugger/gui/CartDPCPlusWidget.hxx | 2 +-
 src/debugger/gui/CartDPCWidget.hxx     | 2 +-
 src/debugger/gui/CartDebugWidget.hxx   | 2 +-
 src/debugger/gui/CartE0Widget.hxx      | 2 +-
 src/debugger/gui/CartE7Widget.hxx      | 2 +-
 src/debugger/gui/CartEFSCWidget.hxx    | 2 +-
 src/debugger/gui/CartEFWidget.hxx      | 2 +-
 src/debugger/gui/CartF0Widget.hxx      | 2 +-
 src/debugger/gui/CartF4SCWidget.hxx    | 2 +-
 src/debugger/gui/CartF4Widget.hxx      | 2 +-
 src/debugger/gui/CartF6SCWidget.hxx    | 2 +-
 src/debugger/gui/CartF6Widget.hxx      | 2 +-
 src/debugger/gui/CartF8SCWidget.hxx    | 2 +-
 src/debugger/gui/CartF8Widget.hxx      | 2 +-
 src/debugger/gui/CartFA2Widget.hxx     | 2 +-
 src/debugger/gui/CartFAWidget.hxx      | 2 +-
 src/debugger/gui/CartFEWidget.hxx      | 2 +-
 src/debugger/gui/CartMCWidget.hxx      | 2 +-
 src/debugger/gui/CartMDMWidget.hxx     | 2 +-
 src/debugger/gui/CartRamWidget.cxx     | 5 -----
 src/debugger/gui/CartRamWidget.hxx     | 2 +-
 src/debugger/gui/CartSBWidget.hxx      | 2 +-
 src/debugger/gui/CartUAWidget.hxx      | 2 +-
 src/debugger/gui/CartWDWidget.hxx      | 2 +-
 src/debugger/gui/CartX07Widget.hxx     | 2 +-
 src/debugger/gui/ColorWidget.cxx       | 5 -----
 src/debugger/gui/ColorWidget.hxx       | 2 +-
 src/debugger/gui/ControllerWidget.hxx  | 2 +-
 src/debugger/gui/CpuWidget.cxx         | 5 -----
 src/debugger/gui/CpuWidget.hxx         | 2 +-
 src/debugger/gui/DataGridOpsWidget.hxx | 2 +-
 src/debugger/gui/DataGridWidget.cxx    | 5 -----
 src/debugger/gui/DataGridWidget.hxx    | 2 +-
 src/debugger/gui/DebuggerDialog.cxx    | 5 -----
 src/debugger/gui/DebuggerDialog.hxx    | 2 +-
 src/debugger/gui/DrivingWidget.cxx     | 5 -----
 src/debugger/gui/DrivingWidget.hxx     | 2 +-
 src/debugger/gui/GenesisWidget.cxx     | 5 -----
 src/debugger/gui/GenesisWidget.hxx     | 2 +-
 src/debugger/gui/JoystickWidget.cxx    | 5 -----
 src/debugger/gui/JoystickWidget.hxx    | 2 +-
 src/debugger/gui/KeyboardWidget.cxx    | 5 -----
 src/debugger/gui/KeyboardWidget.hxx    | 2 +-
 src/debugger/gui/NullControlWidget.hxx | 2 +-
 src/debugger/gui/PaddleWidget.cxx      | 5 -----
 src/debugger/gui/PaddleWidget.hxx      | 2 +-
 src/debugger/gui/PromptWidget.cxx      | 5 -----
 src/debugger/gui/PromptWidget.hxx      | 2 +-
 src/debugger/gui/RiotRamWidget.cxx     | 5 -----
 src/debugger/gui/RiotRamWidget.hxx     | 2 +-
 src/debugger/gui/RiotWidget.cxx        | 5 -----
 src/debugger/gui/RiotWidget.hxx        | 2 +-
 src/debugger/gui/RomListSettings.cxx   | 5 -----
 src/debugger/gui/RomListSettings.hxx   | 2 +-
 src/debugger/gui/RomListWidget.cxx     | 5 -----
 src/debugger/gui/RomListWidget.hxx     | 2 +-
 src/debugger/gui/RomWidget.cxx         | 5 -----
 src/debugger/gui/RomWidget.hxx         | 2 +-
 src/debugger/gui/SaveKeyWidget.hxx     | 2 +-
 src/debugger/gui/TiaInfoWidget.cxx     | 5 -----
 src/debugger/gui/TiaInfoWidget.hxx     | 2 +-
 src/debugger/gui/TiaOutputWidget.cxx   | 5 -----
 src/debugger/gui/TiaOutputWidget.hxx   | 2 +-
 src/debugger/gui/TiaWidget.cxx         | 5 -----
 src/debugger/gui/TiaWidget.hxx         | 2 +-
 src/debugger/gui/TiaZoomWidget.cxx     | 5 -----
 src/debugger/gui/TiaZoomWidget.hxx     | 2 +-
 src/debugger/gui/ToggleBitWidget.cxx   | 5 -----
 src/debugger/gui/ToggleBitWidget.hxx   | 2 +-
 src/debugger/gui/TogglePixelWidget.cxx | 5 -----
 src/debugger/gui/TogglePixelWidget.hxx | 2 +-
 src/debugger/gui/ToggleWidget.cxx      | 5 -----
 src/debugger/gui/ToggleWidget.hxx      | 2 +-
 100 files changed, 74 insertions(+), 211 deletions(-)

diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 222167470..a2482339c 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -111,11 +111,6 @@ CartDebug::CartDebug(Debugger& dbg, Console& console, const OSystem& osystem)
   DiStella::settings.bwidth = 9;  // TODO - configure based on window size
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartDebug::~CartDebug()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 const DebuggerState& CartDebug::getState()
 {
diff --git a/src/debugger/CartDebug.hxx b/src/debugger/CartDebug.hxx
index e2c468b46..8dd6ca308 100644
--- a/src/debugger/CartDebug.hxx
+++ b/src/debugger/CartDebug.hxx
@@ -89,7 +89,7 @@ class CartDebug : public DebuggerSystem
 
   public:
     CartDebug(Debugger& dbg, Console& console, const OSystem& osystem);
-    virtual ~CartDebug();
+    virtual ~CartDebug() = default;
 
     const DebuggerState& getState() override;
     const DebuggerState& getOldState() override { return myOldState; }
diff --git a/src/debugger/DebuggerSystem.hxx b/src/debugger/DebuggerSystem.hxx
index bc41ace94..ae167e0d8 100644
--- a/src/debugger/DebuggerSystem.hxx
+++ b/src/debugger/DebuggerSystem.hxx
@@ -32,8 +32,8 @@ class Debugger;
 class DebuggerState
 {
   public:
-    DebuggerState()  { }
-    ~DebuggerState() { }
+    DebuggerState()  = default;
+    ~DebuggerState() = default;
 
     DebuggerState(const DebuggerState&) = default;
     DebuggerState(DebuggerState&&) = delete;
@@ -51,7 +51,7 @@ class DebuggerSystem
   public:
     DebuggerSystem(Debugger& dbg, Console& console) :
       myDebugger(dbg), myConsole(console), mySystem(console.system()) { }
-    virtual ~DebuggerSystem() { }
+    virtual ~DebuggerSystem() = default;
 
     virtual const DebuggerState& getState() = 0;
     virtual const DebuggerState& getOldState() = 0;
diff --git a/src/debugger/DiStella.cxx b/src/debugger/DiStella.cxx
index 8b1c5bbcd..671409994 100644
--- a/src/debugger/DiStella.cxx
+++ b/src/debugger/DiStella.cxx
@@ -222,11 +222,6 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
   disasm(myOffset, 3);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-DiStella::~DiStella()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DiStella::disasm(uInt32 distart, int pass)
 {
diff --git a/src/debugger/DiStella.hxx b/src/debugger/DiStella.hxx
index 3eb0fe6ee..44c7c0e6b 100644
--- a/src/debugger/DiStella.hxx
+++ b/src/debugger/DiStella.hxx
@@ -71,8 +71,6 @@ class DiStella
              uInt8* labels, uInt8* directives,
              CartDebug::ReservedEquates& reserved);
 
-    ~DiStella();
-
   private:
     // Indicate that a new line of disassembly has been completed
     // In the original Distella code, this indicated a new line to be printed
diff --git a/src/debugger/Expression.hxx b/src/debugger/Expression.hxx
index d9ef482dd..8d77bc7fb 100644
--- a/src/debugger/Expression.hxx
+++ b/src/debugger/Expression.hxx
@@ -36,7 +36,7 @@ class Expression
   public:
     Expression(Expression* lhs = nullptr, Expression* rhs = nullptr)
       : myLHS(lhs), myRHS(rhs) { }
-    virtual ~Expression() { }
+    virtual ~Expression() = default;
 
     virtual uInt16 evaluate() const { return 0; }
 
diff --git a/src/debugger/gui/AtariVoxWidget.hxx b/src/debugger/gui/AtariVoxWidget.hxx
index 995fde9f1..45679d64b 100644
--- a/src/debugger/gui/AtariVoxWidget.hxx
+++ b/src/debugger/gui/AtariVoxWidget.hxx
@@ -30,7 +30,7 @@ class AtariVoxWidget : public ControllerWidget
   public:
     AtariVoxWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                    Controller& controller);
-    virtual ~AtariVoxWidget() { }
+    virtual ~AtariVoxWidget() = default;
 
   private:
     ButtonWidget* myEEPROMErase;
diff --git a/src/debugger/gui/AudioWidget.cxx b/src/debugger/gui/AudioWidget.cxx
index 52d58ff37..05348fa38 100644
--- a/src/debugger/gui/AudioWidget.cxx
+++ b/src/debugger/gui/AudioWidget.cxx
@@ -83,11 +83,6 @@ AudioWidget::AudioWidget(GuiObject* boss, const GUI::Font& lfont,
   addFocusWidget(myAudV);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-AudioWidget::~AudioWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void AudioWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
 {
diff --git a/src/debugger/gui/AudioWidget.hxx b/src/debugger/gui/AudioWidget.hxx
index a29ca8560..0f70f9e6b 100644
--- a/src/debugger/gui/AudioWidget.hxx
+++ b/src/debugger/gui/AudioWidget.hxx
@@ -32,7 +32,7 @@ class AudioWidget : public Widget, public CommandSender
   public:
     AudioWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
                 int x, int y, int w, int h);
-    virtual ~AudioWidget();
+    virtual ~AudioWidget() = default;
 
   private:
     // ID's for the various widgets
diff --git a/src/debugger/gui/BoosterWidget.cxx b/src/debugger/gui/BoosterWidget.cxx
index 94c3020f2..5c45962b5 100644
--- a/src/debugger/gui/BoosterWidget.cxx
+++ b/src/debugger/gui/BoosterWidget.cxx
@@ -73,11 +73,6 @@ BoosterWidget::BoosterWidget(GuiObject* boss, const GUI::Font& font,
   myPins[kJTrigger]->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-BoosterWidget::~BoosterWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void BoosterWidget::loadConfig()
 {
diff --git a/src/debugger/gui/BoosterWidget.hxx b/src/debugger/gui/BoosterWidget.hxx
index 065ae1b13..4ab923bb5 100644
--- a/src/debugger/gui/BoosterWidget.hxx
+++ b/src/debugger/gui/BoosterWidget.hxx
@@ -29,7 +29,7 @@ class BoosterWidget : public ControllerWidget
   public:
     BoosterWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                    Controller& controller);
-    virtual ~BoosterWidget();
+    virtual ~BoosterWidget() = default;
 
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire, kJBooster, kJTrigger };
diff --git a/src/debugger/gui/Cart0840Widget.hxx b/src/debugger/gui/Cart0840Widget.hxx
index a52cf177c..64fd90d39 100644
--- a/src/debugger/gui/Cart0840Widget.hxx
+++ b/src/debugger/gui/Cart0840Widget.hxx
@@ -32,7 +32,7 @@ class Cartridge0840Widget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         Cartridge0840& cart);
-    virtual ~Cartridge0840Widget() { }
+    virtual ~Cartridge0840Widget() = default;
 
   private:
     Cartridge0840& myCart;
diff --git a/src/debugger/gui/Cart2KWidget.hxx b/src/debugger/gui/Cart2KWidget.hxx
index 3844ff1e9..06776e7de 100644
--- a/src/debugger/gui/Cart2KWidget.hxx
+++ b/src/debugger/gui/Cart2KWidget.hxx
@@ -30,7 +30,7 @@ class Cartridge2KWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       Cartridge2K& cart);
-    virtual ~Cartridge2KWidget() { }
+    virtual ~Cartridge2KWidget() = default;
 
   private:
     // No implementation for non-bankswitched ROMs
diff --git a/src/debugger/gui/Cart3EWidget.hxx b/src/debugger/gui/Cart3EWidget.hxx
index fc95a5bce..bb17e13e3 100644
--- a/src/debugger/gui/Cart3EWidget.hxx
+++ b/src/debugger/gui/Cart3EWidget.hxx
@@ -32,7 +32,7 @@ class Cartridge3EWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       Cartridge3E& cart);
-    virtual ~Cartridge3EWidget() { }
+    virtual ~Cartridge3EWidget() = default;
 
   private:
     Cartridge3E& myCart;
diff --git a/src/debugger/gui/Cart3FWidget.hxx b/src/debugger/gui/Cart3FWidget.hxx
index efff0fdb1..f87a6c074 100644
--- a/src/debugger/gui/Cart3FWidget.hxx
+++ b/src/debugger/gui/Cart3FWidget.hxx
@@ -32,7 +32,7 @@ class Cartridge3FWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       Cartridge3F& cart);
-    virtual ~Cartridge3FWidget() { }
+    virtual ~Cartridge3FWidget() = default;
 
   private:
     Cartridge3F& myCart;
diff --git a/src/debugger/gui/Cart4A50Widget.hxx b/src/debugger/gui/Cart4A50Widget.hxx
index 2c5122109..a2a5c036c 100644
--- a/src/debugger/gui/Cart4A50Widget.hxx
+++ b/src/debugger/gui/Cart4A50Widget.hxx
@@ -32,7 +32,7 @@ class Cartridge4A50Widget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         Cartridge4A50& cart);
-    virtual ~Cartridge4A50Widget() { }
+    virtual ~Cartridge4A50Widget() = default;
 
   private:
     Cartridge4A50& myCart;
diff --git a/src/debugger/gui/Cart4KSCWidget.hxx b/src/debugger/gui/Cart4KSCWidget.hxx
index be4a595cd..5ef7677be 100644
--- a/src/debugger/gui/Cart4KSCWidget.hxx
+++ b/src/debugger/gui/Cart4KSCWidget.hxx
@@ -30,7 +30,7 @@ class Cartridge4KSCWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       Cartridge4KSC& cart);
-    virtual ~Cartridge4KSCWidget() { }
+    virtual ~Cartridge4KSCWidget() = default;
 
   private:
     Cartridge4KSC& myCart;
diff --git a/src/debugger/gui/Cart4KWidget.hxx b/src/debugger/gui/Cart4KWidget.hxx
index 451a94060..3547b9701 100644
--- a/src/debugger/gui/Cart4KWidget.hxx
+++ b/src/debugger/gui/Cart4KWidget.hxx
@@ -30,7 +30,7 @@ class Cartridge4KWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       Cartridge4K& cart);
-    virtual ~Cartridge4KWidget() { }
+    virtual ~Cartridge4KWidget() = default;
 
   private:
     // No implementation for non-bankswitched ROMs
diff --git a/src/debugger/gui/CartARWidget.hxx b/src/debugger/gui/CartARWidget.hxx
index d56495cec..724c9f0f5 100644
--- a/src/debugger/gui/CartARWidget.hxx
+++ b/src/debugger/gui/CartARWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeARWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeAR& cart);
-    virtual ~CartridgeARWidget() { }
+    virtual ~CartridgeARWidget() = default;
 
   private:
     CartridgeAR& myCart;
diff --git a/src/debugger/gui/CartBFSCWidget.hxx b/src/debugger/gui/CartBFSCWidget.hxx
index 98fb19ea6..2aa66da08 100644
--- a/src/debugger/gui/CartBFSCWidget.hxx
+++ b/src/debugger/gui/CartBFSCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeBFSCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeBFSC& cart);
-    virtual ~CartridgeBFSCWidget() { }
+    virtual ~CartridgeBFSCWidget() = default;
 
   private:
     CartridgeBFSC& myCart;
diff --git a/src/debugger/gui/CartBFWidget.hxx b/src/debugger/gui/CartBFWidget.hxx
index 5a825b88f..94c4a4375 100644
--- a/src/debugger/gui/CartBFWidget.hxx
+++ b/src/debugger/gui/CartBFWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeBFWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeBF& cart);
-    virtual ~CartridgeBFWidget() { }
+    virtual ~CartridgeBFWidget() = default;
 
   private:
     CartridgeBF& myCart;
diff --git a/src/debugger/gui/CartCMWidget.hxx b/src/debugger/gui/CartCMWidget.hxx
index 38b416fce..9f82c8e78 100644
--- a/src/debugger/gui/CartCMWidget.hxx
+++ b/src/debugger/gui/CartCMWidget.hxx
@@ -36,7 +36,7 @@ class CartridgeCMWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeCM& cart);
-    virtual ~CartridgeCMWidget() { }
+    virtual ~CartridgeCMWidget() = default;
 
   private:
     struct CartState {
diff --git a/src/debugger/gui/CartCTYWidget.hxx b/src/debugger/gui/CartCTYWidget.hxx
index e78632475..ac251bf52 100644
--- a/src/debugger/gui/CartCTYWidget.hxx
+++ b/src/debugger/gui/CartCTYWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeCTYWidget : public CartDebugWidget
                        const GUI::Font& nfont,
                        int x, int y, int w, int h,
                        CartridgeCTY& cart);
-    virtual ~CartridgeCTYWidget() { }
+    virtual ~CartridgeCTYWidget() = default;
 
   private:
     CartridgeCTY& myCart;
diff --git a/src/debugger/gui/CartCVWidget.hxx b/src/debugger/gui/CartCVWidget.hxx
index ddd8ca90d..a593117f7 100644
--- a/src/debugger/gui/CartCVWidget.hxx
+++ b/src/debugger/gui/CartCVWidget.hxx
@@ -30,7 +30,7 @@ class CartridgeCVWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeCV& cart);
-    virtual ~CartridgeCVWidget() { }
+    virtual ~CartridgeCVWidget() = default;
 
   private:
     CartridgeCV& myCart;
diff --git a/src/debugger/gui/CartDASHWidget.hxx b/src/debugger/gui/CartDASHWidget.hxx
index a0ee50565..67961c1c9 100644
--- a/src/debugger/gui/CartDASHWidget.hxx
+++ b/src/debugger/gui/CartDASHWidget.hxx
@@ -33,7 +33,7 @@ class CartridgeDASHWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeDASH& cart);
-    virtual ~CartridgeDASHWidget() { }
+    virtual ~CartridgeDASHWidget() = default;
 
   private:
     void updateUIState();
diff --git a/src/debugger/gui/CartDFSCWidget.hxx b/src/debugger/gui/CartDFSCWidget.hxx
index 250b5c39c..7fbab77c0 100644
--- a/src/debugger/gui/CartDFSCWidget.hxx
+++ b/src/debugger/gui/CartDFSCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeDFSCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeDFSC& cart);
-    virtual ~CartridgeDFSCWidget() { }
+    virtual ~CartridgeDFSCWidget() = default;
 
   private:
     CartridgeDFSC& myCart;
diff --git a/src/debugger/gui/CartDFWidget.hxx b/src/debugger/gui/CartDFWidget.hxx
index c15973c76..aa11a0cf8 100644
--- a/src/debugger/gui/CartDFWidget.hxx
+++ b/src/debugger/gui/CartDFWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeDFWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeDF& cart);
-    virtual ~CartridgeDFWidget() { }
+    virtual ~CartridgeDFWidget() = default;
 
   private:
     CartridgeDF& myCart;
diff --git a/src/debugger/gui/CartDPCPlusWidget.hxx b/src/debugger/gui/CartDPCPlusWidget.hxx
index dbd587a06..7e131bef1 100644
--- a/src/debugger/gui/CartDPCPlusWidget.hxx
+++ b/src/debugger/gui/CartDPCPlusWidget.hxx
@@ -34,7 +34,7 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
                            const GUI::Font& nfont,
                            int x, int y, int w, int h,
                            CartridgeDPCPlus& cart);
-    virtual ~CartridgeDPCPlusWidget() { }
+    virtual ~CartridgeDPCPlusWidget() = default;
 
   private:
     struct CartState {
diff --git a/src/debugger/gui/CartDPCWidget.hxx b/src/debugger/gui/CartDPCWidget.hxx
index d984288ac..1315b8d88 100644
--- a/src/debugger/gui/CartDPCWidget.hxx
+++ b/src/debugger/gui/CartDPCWidget.hxx
@@ -33,7 +33,7 @@ class CartridgeDPCWidget : public CartDebugWidget
                        const GUI::Font& nfont,
                        int x, int y, int w, int h,
                        CartridgeDPC& cart);
-    virtual ~CartridgeDPCWidget() { }
+    virtual ~CartridgeDPCWidget() = default;
 
   private:
     struct CartState {
diff --git a/src/debugger/gui/CartDebugWidget.hxx b/src/debugger/gui/CartDebugWidget.hxx
index da76b5af1..3d477298c 100644
--- a/src/debugger/gui/CartDebugWidget.hxx
+++ b/src/debugger/gui/CartDebugWidget.hxx
@@ -48,7 +48,7 @@ class CartDebugWidget : public Widget, public CommandSender
         myButtonHeight(myLineHeight + 4),
         myDesc(nullptr)   { }
 
-    virtual ~CartDebugWidget() { }
+    virtual ~CartDebugWidget() = default;
 
   public:
     int addBaseInformation(int bytes, const string& manufacturer,
diff --git a/src/debugger/gui/CartE0Widget.hxx b/src/debugger/gui/CartE0Widget.hxx
index d1e8bc18a..2aff9fc54 100644
--- a/src/debugger/gui/CartE0Widget.hxx
+++ b/src/debugger/gui/CartE0Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeE0Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeE0& cart);
-    virtual ~CartridgeE0Widget() { }
+    virtual ~CartridgeE0Widget() = default;
 
   private:
     CartridgeE0& myCart;
diff --git a/src/debugger/gui/CartE7Widget.hxx b/src/debugger/gui/CartE7Widget.hxx
index 2d90873b5..b17cc50fa 100644
--- a/src/debugger/gui/CartE7Widget.hxx
+++ b/src/debugger/gui/CartE7Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeE7Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeE7& cart);
-    virtual ~CartridgeE7Widget() { }
+    virtual ~CartridgeE7Widget() = default;
   
   private:
     CartridgeE7& myCart;
diff --git a/src/debugger/gui/CartEFSCWidget.hxx b/src/debugger/gui/CartEFSCWidget.hxx
index 2a8f79491..157d6a148 100644
--- a/src/debugger/gui/CartEFSCWidget.hxx
+++ b/src/debugger/gui/CartEFSCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeEFSCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeEFSC& cart);
-    virtual ~CartridgeEFSCWidget() { }
+    virtual ~CartridgeEFSCWidget() = default;
 
   private:
     CartridgeEFSC& myCart;
diff --git a/src/debugger/gui/CartEFWidget.hxx b/src/debugger/gui/CartEFWidget.hxx
index 8a0e8062f..b386b0463 100644
--- a/src/debugger/gui/CartEFWidget.hxx
+++ b/src/debugger/gui/CartEFWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeEFWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeEF& cart);
-    virtual ~CartridgeEFWidget() { }
+    virtual ~CartridgeEFWidget() = default;
 
   private:
     CartridgeEF& myCart;
diff --git a/src/debugger/gui/CartF0Widget.hxx b/src/debugger/gui/CartF0Widget.hxx
index 19fbfcb15..5b9183da4 100644
--- a/src/debugger/gui/CartF0Widget.hxx
+++ b/src/debugger/gui/CartF0Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeF0Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeF0& cart);
-    virtual ~CartridgeF0Widget() { }
+    virtual ~CartridgeF0Widget() = default;
 
   private:
     CartridgeF0& myCart;
diff --git a/src/debugger/gui/CartF4SCWidget.hxx b/src/debugger/gui/CartF4SCWidget.hxx
index 9718ca534..f8b5d8082 100644
--- a/src/debugger/gui/CartF4SCWidget.hxx
+++ b/src/debugger/gui/CartF4SCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeF4SCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeF4SC& cart);
-    virtual ~CartridgeF4SCWidget() { }
+    virtual ~CartridgeF4SCWidget() = default;
   
   private:
     CartridgeF4SC& myCart;
diff --git a/src/debugger/gui/CartF4Widget.hxx b/src/debugger/gui/CartF4Widget.hxx
index 83656b00b..14b7d14b0 100644
--- a/src/debugger/gui/CartF4Widget.hxx
+++ b/src/debugger/gui/CartF4Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeF4Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeF4& cart);
-    virtual ~CartridgeF4Widget() { }
+    virtual ~CartridgeF4Widget() = default;
 
   private:
     CartridgeF4& myCart;
diff --git a/src/debugger/gui/CartF6SCWidget.hxx b/src/debugger/gui/CartF6SCWidget.hxx
index a015eee5e..9da468c74 100644
--- a/src/debugger/gui/CartF6SCWidget.hxx
+++ b/src/debugger/gui/CartF6SCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeF6SCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeF6SC& cart);
-    virtual ~CartridgeF6SCWidget() { }
+    virtual ~CartridgeF6SCWidget() = default;
 
   private:
     struct CartState {
diff --git a/src/debugger/gui/CartF6Widget.hxx b/src/debugger/gui/CartF6Widget.hxx
index b7fdd4f06..1e9147093 100644
--- a/src/debugger/gui/CartF6Widget.hxx
+++ b/src/debugger/gui/CartF6Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeF6Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeF6& cart);
-    virtual ~CartridgeF6Widget() { }
+    virtual ~CartridgeF6Widget() = default;
 
   private:
     CartridgeF6& myCart;
diff --git a/src/debugger/gui/CartF8SCWidget.hxx b/src/debugger/gui/CartF8SCWidget.hxx
index 2b026fc15..e8ef73a09 100644
--- a/src/debugger/gui/CartF8SCWidget.hxx
+++ b/src/debugger/gui/CartF8SCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeF8SCWidget : public CartDebugWidget
                         const GUI::Font& nfont,
                         int x, int y, int w, int h,
                         CartridgeF8SC& cart);
-    virtual ~CartridgeF8SCWidget() { }
+    virtual ~CartridgeF8SCWidget() = default;
   
   private:
     CartridgeF8SC& myCart;
diff --git a/src/debugger/gui/CartF8Widget.hxx b/src/debugger/gui/CartF8Widget.hxx
index ce93a0345..78659319a 100644
--- a/src/debugger/gui/CartF8Widget.hxx
+++ b/src/debugger/gui/CartF8Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeF8Widget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeF8& cart);
-    virtual ~CartridgeF8Widget() { }
+    virtual ~CartridgeF8Widget() = default;
 
   private:
     CartridgeF8& myCart;
diff --git a/src/debugger/gui/CartFA2Widget.hxx b/src/debugger/gui/CartFA2Widget.hxx
index e24e6407b..4cd2826f9 100644
--- a/src/debugger/gui/CartFA2Widget.hxx
+++ b/src/debugger/gui/CartFA2Widget.hxx
@@ -33,7 +33,7 @@ class CartridgeFA2Widget : public CartDebugWidget
                        const GUI::Font& nfont,
                        int x, int y, int w, int h,
                        CartridgeFA2& cart);
-    virtual ~CartridgeFA2Widget() { }
+    virtual ~CartridgeFA2Widget() = default;
 
   private:
     CartridgeFA2& myCart;
diff --git a/src/debugger/gui/CartFAWidget.hxx b/src/debugger/gui/CartFAWidget.hxx
index 42ce763a6..43e89b770 100644
--- a/src/debugger/gui/CartFAWidget.hxx
+++ b/src/debugger/gui/CartFAWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeFAWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeFA& cart);
-    virtual ~CartridgeFAWidget() { }
+    virtual ~CartridgeFAWidget() = default;
 
   private:
     CartridgeFA& myCart;
diff --git a/src/debugger/gui/CartFEWidget.hxx b/src/debugger/gui/CartFEWidget.hxx
index 8f3d985bb..500882220 100644
--- a/src/debugger/gui/CartFEWidget.hxx
+++ b/src/debugger/gui/CartFEWidget.hxx
@@ -30,7 +30,7 @@ class CartridgeFEWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeFE& cart);
-    virtual ~CartridgeFEWidget() { }
+    virtual ~CartridgeFEWidget() = default;
 
   private:
     CartridgeFE& myCart;
diff --git a/src/debugger/gui/CartMCWidget.hxx b/src/debugger/gui/CartMCWidget.hxx
index 730aca4ff..3d56955a3 100644
--- a/src/debugger/gui/CartMCWidget.hxx
+++ b/src/debugger/gui/CartMCWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeMCWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeMC& cart);
-    virtual ~CartridgeMCWidget() { }
+    virtual ~CartridgeMCWidget() = default;
 
   private:
     CartridgeMC& myCart;
diff --git a/src/debugger/gui/CartMDMWidget.hxx b/src/debugger/gui/CartMDMWidget.hxx
index 3b676dce7..1730bd9a4 100644
--- a/src/debugger/gui/CartMDMWidget.hxx
+++ b/src/debugger/gui/CartMDMWidget.hxx
@@ -33,7 +33,7 @@ class CartridgeMDMWidget : public CartDebugWidget
                        const GUI::Font& nfont,
                        int x, int y, int w, int h,
                        CartridgeMDM& cart);
-    virtual ~CartridgeMDMWidget() { }
+    virtual ~CartridgeMDMWidget() = default;
 
   private:
     CartridgeMDM& myCart;
diff --git a/src/debugger/gui/CartRamWidget.cxx b/src/debugger/gui/CartRamWidget.cxx
index 07058d57d..4a8d22fd2 100644
--- a/src/debugger/gui/CartRamWidget.cxx
+++ b/src/debugger/gui/CartRamWidget.cxx
@@ -83,11 +83,6 @@ CartRamWidget::CartRamWidget(
   addToFocusList(myRam->getFocusList());
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartRamWidget::~CartRamWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartRamWidget::loadConfig()
 {
diff --git a/src/debugger/gui/CartRamWidget.hxx b/src/debugger/gui/CartRamWidget.hxx
index 4a3af89e7..6d83936a0 100644
--- a/src/debugger/gui/CartRamWidget.hxx
+++ b/src/debugger/gui/CartRamWidget.hxx
@@ -36,7 +36,7 @@ class CartRamWidget : public Widget, public CommandSender
     CartRamWidget(GuiObject* boss, const GUI::Font& lfont,
                   const GUI::Font& nfont,
                   int x, int y, int w, int h, CartDebugWidget& cartDebug);
-    virtual ~CartRamWidget();
+    virtual ~CartRamWidget() = default;
 
     void loadConfig() override;
     void setOpsWidget(DataGridOpsWidget* w);
diff --git a/src/debugger/gui/CartSBWidget.hxx b/src/debugger/gui/CartSBWidget.hxx
index 0e30bdf0f..effd81639 100644
--- a/src/debugger/gui/CartSBWidget.hxx
+++ b/src/debugger/gui/CartSBWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeSBWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeSB& cart);
-    virtual ~CartridgeSBWidget() { }
+    virtual ~CartridgeSBWidget() = default;
 
   private:
     CartridgeSB& myCart;
diff --git a/src/debugger/gui/CartUAWidget.hxx b/src/debugger/gui/CartUAWidget.hxx
index f8220d7af..82d54d13f 100644
--- a/src/debugger/gui/CartUAWidget.hxx
+++ b/src/debugger/gui/CartUAWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeUAWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeUA& cart);
-    virtual ~CartridgeUAWidget() { }
+    virtual ~CartridgeUAWidget() = default;
 
   private:
     CartridgeUA& myCart;
diff --git a/src/debugger/gui/CartWDWidget.hxx b/src/debugger/gui/CartWDWidget.hxx
index ee27544bf..46e51f73a 100644
--- a/src/debugger/gui/CartWDWidget.hxx
+++ b/src/debugger/gui/CartWDWidget.hxx
@@ -32,7 +32,7 @@ class CartridgeWDWidget : public CartDebugWidget
                       const GUI::Font& nfont,
                       int x, int y, int w, int h,
                       CartridgeWD& cart);
-    virtual ~CartridgeWDWidget() { }
+    virtual ~CartridgeWDWidget() = default;
 
   private:
     CartridgeWD& myCart;
diff --git a/src/debugger/gui/CartX07Widget.hxx b/src/debugger/gui/CartX07Widget.hxx
index 1590b36d6..b6fb6f7c5 100644
--- a/src/debugger/gui/CartX07Widget.hxx
+++ b/src/debugger/gui/CartX07Widget.hxx
@@ -32,7 +32,7 @@ class CartridgeX07Widget : public CartDebugWidget
                        const GUI::Font& nfont,
                        int x, int y, int w, int h,
                        CartridgeX07& cart);
-    virtual ~CartridgeX07Widget() { }
+    virtual ~CartridgeX07Widget() = default;
 
   private:
     CartridgeX07& myCart;
diff --git a/src/debugger/gui/ColorWidget.cxx b/src/debugger/gui/ColorWidget.cxx
index f09eb3dfc..bd2fa17b5 100644
--- a/src/debugger/gui/ColorWidget.cxx
+++ b/src/debugger/gui/ColorWidget.cxx
@@ -37,11 +37,6 @@ ColorWidget::ColorWidget(GuiObject* boss, const GUI::Font& font,
   _flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ColorWidget::~ColorWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ColorWidget::setColor(int color)
 {
diff --git a/src/debugger/gui/ColorWidget.hxx b/src/debugger/gui/ColorWidget.hxx
index 88a23f2d9..a89f24b2a 100644
--- a/src/debugger/gui/ColorWidget.hxx
+++ b/src/debugger/gui/ColorWidget.hxx
@@ -40,7 +40,7 @@ class ColorWidget : public Widget, public CommandSender
   public:
     ColorWidget(GuiObject* boss, const GUI::Font& font,
                 int x, int y, int w, int h, int cmd = 0);
-    ~ColorWidget();
+    virtual ~ColorWidget() = default;
 
     void setColor(int color);
     int  getColor() const { return _color;  }
diff --git a/src/debugger/gui/ControllerWidget.hxx b/src/debugger/gui/ControllerWidget.hxx
index c26dd396e..0ccfcd2e9 100644
--- a/src/debugger/gui/ControllerWidget.hxx
+++ b/src/debugger/gui/ControllerWidget.hxx
@@ -39,7 +39,7 @@ class ControllerWidget : public Widget, public CommandSender
       _h = 8 * font.getLineHeight();
     }
 
-    virtual ~ControllerWidget() { }
+    virtual ~ControllerWidget() = default;
 
     virtual void loadConfig() override { }
 
diff --git a/src/debugger/gui/CpuWidget.cxx b/src/debugger/gui/CpuWidget.cxx
index 187120895..96c884a53 100644
--- a/src/debugger/gui/CpuWidget.cxx
+++ b/src/debugger/gui/CpuWidget.cxx
@@ -132,11 +132,6 @@ CpuWidget::CpuWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
   _h = ypos + myPSRegister->getHeight() - y;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CpuWidget::~CpuWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuWidget::setOpsWidget(DataGridOpsWidget* w)
 {
diff --git a/src/debugger/gui/CpuWidget.hxx b/src/debugger/gui/CpuWidget.hxx
index 7859e315c..4d0af040a 100644
--- a/src/debugger/gui/CpuWidget.hxx
+++ b/src/debugger/gui/CpuWidget.hxx
@@ -35,7 +35,7 @@ class CpuWidget : public Widget, public CommandSender
   public:
     CpuWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
               int x, int y, int max_w);
-    virtual ~CpuWidget();
+    virtual ~CpuWidget() = default;
 
     void setOpsWidget(DataGridOpsWidget* w);
     void loadConfig() override;
diff --git a/src/debugger/gui/DataGridOpsWidget.hxx b/src/debugger/gui/DataGridOpsWidget.hxx
index 709aae7ec..5bd9bd79b 100644
--- a/src/debugger/gui/DataGridOpsWidget.hxx
+++ b/src/debugger/gui/DataGridOpsWidget.hxx
@@ -38,7 +38,7 @@ class DataGridOpsWidget : public Widget, public CommandSender
 {
   public:
     DataGridOpsWidget(GuiObject* boss, const GUI::Font& font, int x, int y);
-    virtual ~DataGridOpsWidget() {}
+    virtual ~DataGridOpsWidget() = default;
 
     void setTarget(CommandReceiver* target);
     void setEnabled(bool e);
diff --git a/src/debugger/gui/DataGridWidget.cxx b/src/debugger/gui/DataGridWidget.cxx
index 3dbb9ad05..a0e88956e 100644
--- a/src/debugger/gui/DataGridWidget.cxx
+++ b/src/debugger/gui/DataGridWidget.cxx
@@ -111,11 +111,6 @@ DataGridWidget::DataGridWidget(GuiObject* boss, const GUI::Font& font,
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-DataGridWidget::~DataGridWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DataGridWidget::setList(const IntArray& alist, const IntArray& vlist,
                              const BoolArray& changed)
diff --git a/src/debugger/gui/DataGridWidget.hxx b/src/debugger/gui/DataGridWidget.hxx
index 3d6095db2..632cff84f 100644
--- a/src/debugger/gui/DataGridWidget.hxx
+++ b/src/debugger/gui/DataGridWidget.hxx
@@ -48,7 +48,7 @@ class DataGridWidget : public EditableWidget
                    int colchars, int bits,
                    Common::Base::Format format = Common::Base::F_DEFAULT,
                    bool useScrollbar = false);
-    virtual ~DataGridWidget();
+    virtual ~DataGridWidget() = default;
 
     void setList(const IntArray& alist, const IntArray& vlist,
                  const BoolArray& changed);
diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx
index c637262b8..fce4e67ac 100644
--- a/src/debugger/gui/DebuggerDialog.cxx
+++ b/src/debugger/gui/DebuggerDialog.cxx
@@ -63,11 +63,6 @@ DebuggerDialog::DebuggerDialog(OSystem& osystem, DialogContainer& parent,
   myTiaOutput->setZoomWidget(myTiaZoom);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-DebuggerDialog::~DebuggerDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DebuggerDialog::loadConfig()
 {
diff --git a/src/debugger/gui/DebuggerDialog.hxx b/src/debugger/gui/DebuggerDialog.hxx
index 75ab42c84..bfc8b38e2 100644
--- a/src/debugger/gui/DebuggerDialog.hxx
+++ b/src/debugger/gui/DebuggerDialog.hxx
@@ -51,7 +51,7 @@ class DebuggerDialog : public Dialog
 
     DebuggerDialog(OSystem& osystem, DialogContainer& parent,
                    int x, int y, int w, int h);
-    virtual ~DebuggerDialog();
+    virtual ~DebuggerDialog() = default;
 
     const GUI::Font& lfont() const     { return *myLFont;        }
     const GUI::Font& nfont() const     { return *myNFont;        }
diff --git a/src/debugger/gui/DrivingWidget.cxx b/src/debugger/gui/DrivingWidget.cxx
index 397e174c3..cd0bd5a6d 100644
--- a/src/debugger/gui/DrivingWidget.cxx
+++ b/src/debugger/gui/DrivingWidget.cxx
@@ -59,11 +59,6 @@ DrivingWidget::DrivingWidget(GuiObject* boss, const GUI::Font& font,
   myFire->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-DrivingWidget::~DrivingWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DrivingWidget::loadConfig()
 {
diff --git a/src/debugger/gui/DrivingWidget.hxx b/src/debugger/gui/DrivingWidget.hxx
index d27e6947b..61228cf55 100644
--- a/src/debugger/gui/DrivingWidget.hxx
+++ b/src/debugger/gui/DrivingWidget.hxx
@@ -33,7 +33,7 @@ class DrivingWidget : public ControllerWidget
   public:
     DrivingWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                   Controller& controller);
-    virtual ~DrivingWidget();
+    virtual ~DrivingWidget() = default;
 
   private:
     enum {
diff --git a/src/debugger/gui/GenesisWidget.cxx b/src/debugger/gui/GenesisWidget.cxx
index 19e69fac6..c479e197a 100644
--- a/src/debugger/gui/GenesisWidget.cxx
+++ b/src/debugger/gui/GenesisWidget.cxx
@@ -68,11 +68,6 @@ GenesisWidget::GenesisWidget(GuiObject* boss, const GUI::Font& font,
   myPins[kJCbtn]->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-GenesisWidget::~GenesisWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void GenesisWidget::loadConfig()
 {
diff --git a/src/debugger/gui/GenesisWidget.hxx b/src/debugger/gui/GenesisWidget.hxx
index 5b92c7867..d13d3d0dd 100644
--- a/src/debugger/gui/GenesisWidget.hxx
+++ b/src/debugger/gui/GenesisWidget.hxx
@@ -29,7 +29,7 @@ class GenesisWidget : public ControllerWidget
   public:
     GenesisWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                   Controller& controller);
-    virtual ~GenesisWidget();
+    virtual ~GenesisWidget() = default;
 
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJBbtn, kJCbtn };
diff --git a/src/debugger/gui/JoystickWidget.cxx b/src/debugger/gui/JoystickWidget.cxx
index 082b28d41..a9654d118 100644
--- a/src/debugger/gui/JoystickWidget.cxx
+++ b/src/debugger/gui/JoystickWidget.cxx
@@ -63,11 +63,6 @@ JoystickWidget::JoystickWidget(GuiObject* boss, const GUI::Font& font,
   myPins[kJFire]->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-JoystickWidget::~JoystickWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void JoystickWidget::loadConfig()
 {
diff --git a/src/debugger/gui/JoystickWidget.hxx b/src/debugger/gui/JoystickWidget.hxx
index 685b9ec37..250b96477 100644
--- a/src/debugger/gui/JoystickWidget.hxx
+++ b/src/debugger/gui/JoystickWidget.hxx
@@ -29,7 +29,7 @@ class JoystickWidget : public ControllerWidget
   public:
     JoystickWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                    Controller& controller);
-    virtual ~JoystickWidget();
+    virtual ~JoystickWidget() = default;
 
   private:
     enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire };
diff --git a/src/debugger/gui/KeyboardWidget.cxx b/src/debugger/gui/KeyboardWidget.cxx
index 426679dbc..2fa7ee129 100644
--- a/src/debugger/gui/KeyboardWidget.cxx
+++ b/src/debugger/gui/KeyboardWidget.cxx
@@ -53,11 +53,6 @@ KeyboardWidget::KeyboardWidget(GuiObject* boss, const GUI::Font& font,
   myEvent = leftport ? ourLeftEvents : ourRightEvents;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-KeyboardWidget::~KeyboardWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void KeyboardWidget::loadConfig()
 {
diff --git a/src/debugger/gui/KeyboardWidget.hxx b/src/debugger/gui/KeyboardWidget.hxx
index 5bac59aa2..17a7fc708 100644
--- a/src/debugger/gui/KeyboardWidget.hxx
+++ b/src/debugger/gui/KeyboardWidget.hxx
@@ -29,7 +29,7 @@ class KeyboardWidget : public ControllerWidget
   public:
     KeyboardWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                    Controller& controller);
-    virtual ~KeyboardWidget();
+    virtual ~KeyboardWidget() = default;
 
   private:
     CheckboxWidget* myBox[12];
diff --git a/src/debugger/gui/NullControlWidget.hxx b/src/debugger/gui/NullControlWidget.hxx
index 14ab462ca..6815ab577 100644
--- a/src/debugger/gui/NullControlWidget.hxx
+++ b/src/debugger/gui/NullControlWidget.hxx
@@ -48,7 +48,7 @@ class NullControlWidget : public ControllerWidget
                            kTextAlignCenter);
     }
 
-    virtual ~NullControlWidget() { }
+    virtual ~NullControlWidget() = default;
 
   private:
     // Following constructors and assignment operators not supported
diff --git a/src/debugger/gui/PaddleWidget.cxx b/src/debugger/gui/PaddleWidget.cxx
index c34b6655c..1bb7a100e 100644
--- a/src/debugger/gui/PaddleWidget.cxx
+++ b/src/debugger/gui/PaddleWidget.cxx
@@ -67,11 +67,6 @@ PaddleWidget::PaddleWidget(GuiObject* boss, const GUI::Font& font,
   myP1Fire->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-PaddleWidget::~PaddleWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void PaddleWidget::loadConfig()
 {
diff --git a/src/debugger/gui/PaddleWidget.hxx b/src/debugger/gui/PaddleWidget.hxx
index e4bf69f49..456107cb2 100644
--- a/src/debugger/gui/PaddleWidget.hxx
+++ b/src/debugger/gui/PaddleWidget.hxx
@@ -29,7 +29,7 @@ class PaddleWidget : public ControllerWidget
   public:
     PaddleWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                  Controller& controller);
-    virtual ~PaddleWidget();
+    virtual ~PaddleWidget() = default;
 
   private:
     enum { kP0Changed = 'P0ch', kP1Changed = 'P1ch',
diff --git a/src/debugger/gui/PromptWidget.cxx b/src/debugger/gui/PromptWidget.cxx
index cfd7edc82..7ff9de6d9 100644
--- a/src/debugger/gui/PromptWidget.cxx
+++ b/src/debugger/gui/PromptWidget.cxx
@@ -69,11 +69,6 @@ PromptWidget::PromptWidget(GuiObject* boss, const GUI::Font& font,
   addFocusWidget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-PromptWidget::~PromptWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void PromptWidget::drawWidget(bool hilite)
 {
diff --git a/src/debugger/gui/PromptWidget.hxx b/src/debugger/gui/PromptWidget.hxx
index 327ef9176..2ee693d40 100644
--- a/src/debugger/gui/PromptWidget.hxx
+++ b/src/debugger/gui/PromptWidget.hxx
@@ -33,7 +33,7 @@ class PromptWidget : public Widget, public CommandSender
   public:
     PromptWidget(GuiObject* boss, const GUI::Font& font,
                  int x, int y, int w, int h);
-    virtual ~PromptWidget();
+    virtual ~PromptWidget() = default;
 
   public:
     int printf(const char* format, ...);
diff --git a/src/debugger/gui/RiotRamWidget.cxx b/src/debugger/gui/RiotRamWidget.cxx
index 86678fa86..bcd0e8ab4 100644
--- a/src/debugger/gui/RiotRamWidget.cxx
+++ b/src/debugger/gui/RiotRamWidget.cxx
@@ -30,11 +30,6 @@ RiotRamWidget::RiotRamWidget(GuiObject* boss, const GUI::Font& lfont,
 {
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RiotRamWidget::~RiotRamWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt8 RiotRamWidget::getValue(int addr) const
 {
diff --git a/src/debugger/gui/RiotRamWidget.hxx b/src/debugger/gui/RiotRamWidget.hxx
index 3af17be0e..fa08aac91 100644
--- a/src/debugger/gui/RiotRamWidget.hxx
+++ b/src/debugger/gui/RiotRamWidget.hxx
@@ -36,7 +36,7 @@ class RiotRamWidget : public RamWidget
   public:
     RiotRamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
                   int x, int y, int w);
-    virtual ~RiotRamWidget();
+    virtual ~RiotRamWidget() = default;
 
   private:
     uInt8 getValue(int addr) const;
diff --git a/src/debugger/gui/RiotWidget.cxx b/src/debugger/gui/RiotWidget.cxx
index 42b98f6dd..6e9b12cd1 100644
--- a/src/debugger/gui/RiotWidget.cxx
+++ b/src/debugger/gui/RiotWidget.cxx
@@ -244,11 +244,6 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont,
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RiotWidget::~RiotWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RiotWidget::loadConfig()
 {
diff --git a/src/debugger/gui/RiotWidget.hxx b/src/debugger/gui/RiotWidget.hxx
index f47ad8be5..637e782cd 100644
--- a/src/debugger/gui/RiotWidget.hxx
+++ b/src/debugger/gui/RiotWidget.hxx
@@ -35,7 +35,7 @@ class RiotWidget : public Widget, public CommandSender
   public:
     RiotWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
                int x, int y, int w, int h);
-    virtual ~RiotWidget();
+    virtual ~RiotWidget() = default;
 
   private:
     ControllerWidget* addControlWidget(GuiObject* boss, const GUI::Font& font,
diff --git a/src/debugger/gui/RomListSettings.cxx b/src/debugger/gui/RomListSettings.cxx
index 7824ed9c6..425e28fd5 100644
--- a/src/debugger/gui/RomListSettings.cxx
+++ b/src/debugger/gui/RomListSettings.cxx
@@ -86,11 +86,6 @@ RomListSettings::RomListSettings(GuiObject* boss, const GUI::Font& font)
   processCancelWithoutWidget(true);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RomListSettings::~RomListSettings()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomListSettings::show(uInt32 x, uInt32 y, int data)
 {
diff --git a/src/debugger/gui/RomListSettings.hxx b/src/debugger/gui/RomListSettings.hxx
index b308cef8b..f208c4ee7 100644
--- a/src/debugger/gui/RomListSettings.hxx
+++ b/src/debugger/gui/RomListSettings.hxx
@@ -34,7 +34,7 @@ class RomListSettings : public Dialog, public CommandSender
 {
   public:
     RomListSettings(GuiObject* boss, const GUI::Font& font);
-    virtual ~RomListSettings();
+    virtual ~RomListSettings() = default;
 
     /** Show dialog onscreen at the specified coordinates
         ('data' will be the currently selected line number in RomListWidget) */
diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx
index 3a53e4e83..d4b03f3d2 100644
--- a/src/debugger/gui/RomListWidget.cxx
+++ b/src/debugger/gui/RomListWidget.cxx
@@ -120,11 +120,6 @@ RomListWidget::RomListWidget(GuiObject* boss, const GUI::Font& lfont,
   setTextFilter(f);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RomListWidget::~RomListWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomListWidget::setList(const CartDebug::Disassembly& disasm,
                             const PackedBitArray& state)
diff --git a/src/debugger/gui/RomListWidget.hxx b/src/debugger/gui/RomListWidget.hxx
index 90adf79a1..a3c798822 100644
--- a/src/debugger/gui/RomListWidget.hxx
+++ b/src/debugger/gui/RomListWidget.hxx
@@ -50,7 +50,7 @@ class RomListWidget : public EditableWidget
   public:
     RomListWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
                     int x, int y, int w, int h);
-    virtual ~RomListWidget();
+    virtual ~RomListWidget() = default;
 
     void setList(const CartDebug::Disassembly& disasm, const PackedBitArray& state);
 
diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx
index eb4a1842d..e41af6ee1 100644
--- a/src/debugger/gui/RomWidget.cxx
+++ b/src/debugger/gui/RomWidget.cxx
@@ -61,11 +61,6 @@ RomWidget::RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
   addFocusWidget(myRomList);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RomWidget::~RomWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomWidget::loadConfig()
 {
diff --git a/src/debugger/gui/RomWidget.hxx b/src/debugger/gui/RomWidget.hxx
index 62a5c72b1..2cd160cb0 100644
--- a/src/debugger/gui/RomWidget.hxx
+++ b/src/debugger/gui/RomWidget.hxx
@@ -38,7 +38,7 @@ class RomWidget : public Widget, public CommandSender
   public:
     RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
               int x, int y, int w, int h);
-    virtual ~RomWidget();
+    virtual ~RomWidget() = default;
 
     void invalidate(bool forcereload = true)
     { myListIsDirty = true; if(forcereload) loadConfig(); }
diff --git a/src/debugger/gui/SaveKeyWidget.hxx b/src/debugger/gui/SaveKeyWidget.hxx
index de361adea..4dd66871a 100644
--- a/src/debugger/gui/SaveKeyWidget.hxx
+++ b/src/debugger/gui/SaveKeyWidget.hxx
@@ -30,7 +30,7 @@ class SaveKeyWidget : public ControllerWidget
   public:
     SaveKeyWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
                   Controller& controller);
-    virtual ~SaveKeyWidget() { }
+    virtual ~SaveKeyWidget() = default;
 
   private:
     ButtonWidget* myEEPROMErase;
diff --git a/src/debugger/gui/TiaInfoWidget.cxx b/src/debugger/gui/TiaInfoWidget.cxx
index 352ff8431..f99d80cd9 100644
--- a/src/debugger/gui/TiaInfoWidget.cxx
+++ b/src/debugger/gui/TiaInfoWidget.cxx
@@ -106,11 +106,6 @@ TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& lfont,
   _h = ypos + lineHeight;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TiaInfoWidget::~TiaInfoWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TiaInfoWidget::handleMouseDown(int x, int y, int button, int clickCount)
 {
diff --git a/src/debugger/gui/TiaInfoWidget.hxx b/src/debugger/gui/TiaInfoWidget.hxx
index 69e28eff3..a29160859 100644
--- a/src/debugger/gui/TiaInfoWidget.hxx
+++ b/src/debugger/gui/TiaInfoWidget.hxx
@@ -32,7 +32,7 @@ class TiaInfoWidget : public Widget, public CommandSender
   public:
     TiaInfoWidget(GuiObject *boss, const GUI::Font& lfont, const GUI::Font& nfont,
                   int x, int y, int max_w);
-    virtual ~TiaInfoWidget();
+    virtual ~TiaInfoWidget() = default;
 
     void loadConfig() override;
 
diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx
index 31024d78e..e4f1c229b 100644
--- a/src/debugger/gui/TiaOutputWidget.cxx
+++ b/src/debugger/gui/TiaOutputWidget.cxx
@@ -52,11 +52,6 @@ TiaOutputWidget::TiaOutputWidget(GuiObject* boss, const GUI::Font& font,
   myMenu = make_ptr<ContextMenu>(this, font, l);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TiaOutputWidget::~TiaOutputWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TiaOutputWidget::loadConfig()
 {
diff --git a/src/debugger/gui/TiaOutputWidget.hxx b/src/debugger/gui/TiaOutputWidget.hxx
index c0d132986..5555594a6 100644
--- a/src/debugger/gui/TiaOutputWidget.hxx
+++ b/src/debugger/gui/TiaOutputWidget.hxx
@@ -34,7 +34,7 @@ class TiaOutputWidget : public Widget, public CommandSender
   public:
     TiaOutputWidget(GuiObject *boss, const GUI::Font& font,
                     int x, int y, int w, int h);
-    virtual ~TiaOutputWidget();
+    virtual ~TiaOutputWidget() = default;
 
     void loadConfig() override;
     void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
diff --git a/src/debugger/gui/TiaWidget.cxx b/src/debugger/gui/TiaWidget.cxx
index 861ecd097..4aaa60da0 100644
--- a/src/debugger/gui/TiaWidget.cxx
+++ b/src/debugger/gui/TiaWidget.cxx
@@ -536,11 +536,6 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont,
   addFocusWidget(myUndrivenPins);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TiaWidget::~TiaWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TiaWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
 {
diff --git a/src/debugger/gui/TiaWidget.hxx b/src/debugger/gui/TiaWidget.hxx
index e45e0206b..c85c791bb 100644
--- a/src/debugger/gui/TiaWidget.hxx
+++ b/src/debugger/gui/TiaWidget.hxx
@@ -37,7 +37,7 @@ class TiaWidget : public Widget, public CommandSender
   public:
     TiaWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
               int x, int y, int w, int h);
-    virtual ~TiaWidget();
+    virtual ~TiaWidget() = default;
 
   private:
     DataGridWidget* myColorRegs;
diff --git a/src/debugger/gui/TiaZoomWidget.cxx b/src/debugger/gui/TiaZoomWidget.cxx
index e35f15d6b..f9d32becf 100644
--- a/src/debugger/gui/TiaZoomWidget.cxx
+++ b/src/debugger/gui/TiaZoomWidget.cxx
@@ -60,11 +60,6 @@ TiaZoomWidget::TiaZoomWidget(GuiObject* boss, const GUI::Font& font,
   myMenu = make_ptr<ContextMenu>(this, font, l);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TiaZoomWidget::~TiaZoomWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TiaZoomWidget::loadConfig()
 {
diff --git a/src/debugger/gui/TiaZoomWidget.hxx b/src/debugger/gui/TiaZoomWidget.hxx
index c2f31ccf8..9cb13dbff 100644
--- a/src/debugger/gui/TiaZoomWidget.hxx
+++ b/src/debugger/gui/TiaZoomWidget.hxx
@@ -32,7 +32,7 @@ class TiaZoomWidget : public Widget, public CommandSender
   public:
     TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
                   int x, int y, int w, int h);
-    virtual ~TiaZoomWidget();
+    virtual ~TiaZoomWidget() = default;
 
     void loadConfig() override;
     void setPos(int x, int y);
diff --git a/src/debugger/gui/ToggleBitWidget.cxx b/src/debugger/gui/ToggleBitWidget.cxx
index 2a78ab102..e9dace16c 100644
--- a/src/debugger/gui/ToggleBitWidget.cxx
+++ b/src/debugger/gui/ToggleBitWidget.cxx
@@ -47,11 +47,6 @@ ToggleBitWidget::ToggleBitWidget(GuiObject* boss, const GUI::Font& font,
   _h = _rowHeight * rows + 1;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ToggleBitWidget::~ToggleBitWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ToggleBitWidget::setList(const StringList& off, const StringList& on)
 {
diff --git a/src/debugger/gui/ToggleBitWidget.hxx b/src/debugger/gui/ToggleBitWidget.hxx
index 590671210..1fcc1e7dc 100644
--- a/src/debugger/gui/ToggleBitWidget.hxx
+++ b/src/debugger/gui/ToggleBitWidget.hxx
@@ -28,7 +28,7 @@ class ToggleBitWidget : public ToggleWidget
   public:
     ToggleBitWidget(GuiObject* boss, const GUI::Font& font,
                     int x, int y, int cols, int rows, int colchars = 1);
-    virtual ~ToggleBitWidget();
+    virtual ~ToggleBitWidget() = default;
 
     void setList(const StringList& off, const StringList& on);
     void setState(const BoolArray& state, const BoolArray& changed);
diff --git a/src/debugger/gui/TogglePixelWidget.cxx b/src/debugger/gui/TogglePixelWidget.cxx
index f4fa8b27d..b60f9f2d9 100644
--- a/src/debugger/gui/TogglePixelWidget.cxx
+++ b/src/debugger/gui/TogglePixelWidget.cxx
@@ -43,11 +43,6 @@ TogglePixelWidget::TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
     _changedList.push_back(false);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-TogglePixelWidget::~TogglePixelWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void TogglePixelWidget::setState(const BoolArray& state)
 {
diff --git a/src/debugger/gui/TogglePixelWidget.hxx b/src/debugger/gui/TogglePixelWidget.hxx
index b17b69842..ebe8daf85 100644
--- a/src/debugger/gui/TogglePixelWidget.hxx
+++ b/src/debugger/gui/TogglePixelWidget.hxx
@@ -28,7 +28,7 @@ class TogglePixelWidget : public ToggleWidget
   public:
     TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
                       int x, int y, int cols, int rows);
-    virtual ~TogglePixelWidget();
+    virtual ~TogglePixelWidget() = default;
 
     void setColor(int color) {
       _pixelColor = (color >= 0 && color <= 255) ? color : kDlgColor;
diff --git a/src/debugger/gui/ToggleWidget.cxx b/src/debugger/gui/ToggleWidget.cxx
index eaf0afcc3..ab3ca12df 100644
--- a/src/debugger/gui/ToggleWidget.cxx
+++ b/src/debugger/gui/ToggleWidget.cxx
@@ -39,11 +39,6 @@ ToggleWidget::ToggleWidget(GuiObject* boss, const GUI::Font& font,
            WIDGET_WANTS_RAWDATA;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ToggleWidget::~ToggleWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ToggleWidget::handleMouseDown(int x, int y, int button, int clickCount)
 {
diff --git a/src/debugger/gui/ToggleWidget.hxx b/src/debugger/gui/ToggleWidget.hxx
index 2779f93e2..24f94895b 100644
--- a/src/debugger/gui/ToggleWidget.hxx
+++ b/src/debugger/gui/ToggleWidget.hxx
@@ -36,7 +36,7 @@ class ToggleWidget : public Widget, public CommandSender
   public:
     ToggleWidget(GuiObject* boss, const GUI::Font& font,
                  int x, int y, int cols, int rows);
-    virtual ~ToggleWidget();
+    virtual ~ToggleWidget() = default;
 
     const BoolArray& getState()    { return _stateList; }
     bool getSelectedState() const  { return _stateList[_selectedItem]; }