Added C++11 "= default" for d'tors in the src/gui classes.

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

src/gui/AboutDialog.cxx

@@ -82,12 +82,6 @@ AboutDialog::AboutDialog(OSystem& osystem, DialogContainer& parent,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-AboutDialog::~AboutDialog()
-{
-  myDesc.clear();
-}
-
 // The following commands can be put at the start of a line (all subject to change):
 //   \C, \L, \R  -- set center/left/right alignment
 //   \c0 - \c5   -- set a custom color:

src/gui/AboutDialog.hxx

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

src/gui/AudioDialog.cxx

@@ -118,11 +118,6 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-AudioDialog::~AudioDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void AudioDialog::loadConfig()
 {

src/gui/AudioDialog.hxx

@@ -35,7 +35,7 @@ class AudioDialog : public Dialog
 {
   public:
     AudioDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font);
-    virtual ~AudioDialog();
+    virtual ~AudioDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/BrowserDialog.cxx

@@ -115,11 +115,6 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
 #endif
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-BrowserDialog::~BrowserDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void BrowserDialog::show(const string& title, const string& startpath,
                          BrowserDialog::ListMode mode, int cmd,

src/gui/BrowserDialog.hxx

@@ -42,7 +42,7 @@ class BrowserDialog : public Dialog, public CommandSender
 
   public:
     BrowserDialog(GuiObject* boss, const GUI::Font& font, int max_w, int max_h);
-    virtual ~BrowserDialog();
+    virtual ~BrowserDialog() = default;
 
     /** Place the browser window onscreen, using the given attributes */
     void show(const string& title, const string& startpath,

src/gui/CheckListWidget.cxx

@@ -46,11 +46,6 @@ CheckListWidget::CheckListWidget(GuiObject* boss, const GUI::Font& font,
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CheckListWidget::~CheckListWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CheckListWidget::setList(const StringList& list, const BoolArray& state)
 {

src/gui/CheckListWidget.hxx

@@ -37,7 +37,7 @@ class CheckListWidget : public ListWidget
   public:
     CheckListWidget(GuiObject* boss, const GUI::Font& font,
                     int x, int y, int w, int h);
-    virtual ~CheckListWidget();
+    virtual ~CheckListWidget() = default;
 
     void setStyle(CheckStyle style);
     void setList(const StringList& list, const BoolArray& state);

src/gui/ComboDialog.cxx

@@ -90,11 +90,6 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ComboDialog::~ComboDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ComboDialog::show(Event::Type event, const string& name)
 {

src/gui/ComboDialog.hxx

@@ -32,7 +32,7 @@ class ComboDialog : public Dialog
 {
   public:
     ComboDialog(GuiObject* boss, const GUI::Font& font, const VariantList& combolist);
-    virtual ~ComboDialog();
+    virtual ~ComboDialog() = default;
 
     /** Place the dialog onscreen and center it */
     void show(Event::Type event, const string& name);

src/gui/Command.hxx

@@ -39,10 +39,10 @@ class CommandReceiver
   friend class CommandSender;
 
   public:
-    virtual ~CommandReceiver() {}
+    virtual ~CommandReceiver() = default;
 
   protected:
-    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) {}
+    virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) { }
 };
 
 class CommandSender
@@ -51,9 +51,9 @@ class CommandSender
   // and add methods addTarget/removeTarget.
   public:
     CommandSender(CommandReceiver* target)
-        : _target(target) {}
+        : _target(target) { }
 
-    virtual ~CommandSender() {}
+    virtual ~CommandSender() = default;
 
     void setTarget(CommandReceiver* target) { _target = target; }
     CommandReceiver* getTarget() const { return _target; }

src/gui/CommandDialog.cxx

@@ -91,11 +91,6 @@ CommandDialog::CommandDialog(OSystem& osystem, DialogContainer& parent)
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CommandDialog::~CommandDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CommandDialog::handleCommand(CommandSender* sender, int cmd,
                                   int data, int id)

src/gui/CommandDialog.hxx

@@ -31,7 +31,7 @@ class CommandDialog : public Dialog
 {
   public:
     CommandDialog(OSystem& osystem, DialogContainer& parent);
-    virtual ~CommandDialog();
+    virtual ~CommandDialog() = default;
 
   protected:
     void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

src/gui/CommandMenu.cxx

@@ -27,8 +27,3 @@ CommandMenu::CommandMenu(OSystem& osystem)
 {
   myBaseDialog = new CommandDialog(myOSystem, *this);
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CommandMenu::~CommandMenu()
-{
-}

src/gui/CommandMenu.hxx

@@ -42,7 +42,7 @@ class CommandMenu : public DialogContainer
     /**
       Destructor
     */
-    virtual ~CommandMenu();
+    virtual ~CommandMenu() = default;
 
   private:
     // Following constructors and assignment operators not supported

src/gui/ConfigPathDialog.cxx

@@ -133,11 +133,6 @@ ConfigPathDialog::ConfigPathDialog(
   myBrowser = make_ptr<BrowserDialog>(this, font, max_w, max_h);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ConfigPathDialog::~ConfigPathDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ConfigPathDialog::loadConfig()
 {

src/gui/ConfigPathDialog.hxx

@@ -23,7 +23,6 @@
 class OSystem;
 class GuiObject;
 class DialogContainer;
-class BrowserDialog;
 class CheckboxWidget;
 class PopUpWidget;
 class EditTextWidget;
@@ -32,6 +31,7 @@ class StaticTextWidget;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
+#include "BrowserDialog.hxx"
 
 class ConfigPathDialog : public Dialog, public CommandSender
 {
@@ -39,7 +39,7 @@ class ConfigPathDialog : public Dialog, public CommandSender
     ConfigPathDialog(OSystem& osystem, DialogContainer& parent,
                      const GUI::Font& font, GuiObject* boss,
                      int max_w, int max_h);
-    virtual ~ConfigPathDialog();
+    virtual ~ConfigPathDialog() = default;
 
   private:
     void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

src/gui/ContextMenu.cxx

@@ -46,11 +46,6 @@ ContextMenu::ContextMenu(GuiObject* boss, const GUI::Font& font,
   addItems(items);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ContextMenu::~ContextMenu()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ContextMenu::addItems(const VariantList& items)
 {

src/gui/ContextMenu.hxx

@@ -45,7 +45,7 @@ class ContextMenu : public Dialog, public CommandSender
   public:
     ContextMenu(GuiObject* boss, const GUI::Font& font,
                 const VariantList& items, int cmd = 0);
-    virtual ~ContextMenu();
+    virtual ~ContextMenu() = default;
 
     /** Add the given items to the widget. */
     void addItems(const VariantList& items);

src/gui/EditTextWidget.hxx

@@ -30,6 +30,7 @@ class EditTextWidget : public EditableWidget
   public:
     EditTextWidget(GuiObject* boss, const GUI::Font& font,
                    int x, int y, int w, int h, const string& text = "");
+    virtual ~EditTextWidget() = default;
 
     void setText(const string& str, bool changed = false) override;
 

src/gui/EditableWidget.cxx

@@ -45,11 +45,6 @@ EditableWidget::EditableWidget(GuiObject* boss, const GUI::Font& font,
   _filter = [](char c) { return isprint(c) && c != '\"'; };
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-EditableWidget::~EditableWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void EditableWidget::setText(const string& str, bool)
 {

src/gui/EditableWidget.hxx

@@ -48,7 +48,7 @@ class EditableWidget : public Widget, public CommandSender
   public:
     EditableWidget(GuiObject* boss, const GUI::Font& font,
                    int x, int y, int w, int h, const string& str = "");
-    virtual ~EditableWidget();
+    virtual ~EditableWidget() = default;
 
     virtual void setText(const string& str, bool changed = false);
     const string& getText() const { return _editString; }

src/gui/EventMappingWidget.cxx

@@ -118,11 +118,6 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
   myKeyMapping->clearFlags(WIDGET_RETAIN_FOCUS);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-EventMappingWidget::~EventMappingWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void EventMappingWidget::loadConfig()
 {

src/gui/EventMappingWidget.hxx

@@ -44,7 +44,7 @@ class EventMappingWidget : public Widget, public CommandSender
     EventMappingWidget(GuiObject* boss, const GUI::Font& font,
                        int x, int y, int w, int h,
                        const StringList& actions, EventMode mode);
-    ~EventMappingWidget();
+    virtual ~EventMappingWidget() = default;
 
     bool remapMode() { return myRemapStatus; }
 

src/gui/FileListWidget.cxx

@@ -33,11 +33,6 @@ FileListWidget::FileListWidget(GuiObject* boss, const GUI::Font& font,
   setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-FileListWidget::~FileListWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FileListWidget::setLocation(const FilesystemNode& node, string select)
 {

src/gui/FileListWidget.hxx

@@ -49,7 +49,7 @@ class FileListWidget : public StringListWidget
   public:
     FileListWidget(GuiObject* boss, const GUI::Font& font,
                    int x, int y, int w, int h);
-    virtual ~FileListWidget();
+    virtual ~FileListWidget() = default;
 
     /** Determines how to display files/folders */
     void setFileListMode(FilesystemNode::ListMode mode) { _fsmode = mode; }

src/gui/GameInfoDialog.cxx

@@ -366,11 +366,6 @@ GameInfoDialog::GameInfoDialog(
   addBGroupToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-GameInfoDialog::~GameInfoDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void GameInfoDialog::loadConfig()
 {

src/gui/GameInfoDialog.hxx

@@ -37,7 +37,7 @@ class GameInfoDialog : public Dialog, public CommandSender
   public:
     GameInfoDialog(OSystem& osystem, DialogContainer& parent,
                    const GUI::Font& font, GuiObject* boss);
-    virtual ~GameInfoDialog();
+    virtual ~GameInfoDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/GameList.hxx

@@ -31,7 +31,7 @@
 class GameList
 {
   public:
-    GameList() { }
+    GameList() = default;
 
     const string& name(uInt32 i) const
       { return i < myArray.size() ? myArray[i]._name : EmptyString; }

src/gui/GlobalPropsDialog.cxx

@@ -144,11 +144,6 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-GlobalPropsDialog::~GlobalPropsDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y,
                                       WidgetArray& wid)

src/gui/GlobalPropsDialog.hxx

@@ -33,7 +33,7 @@ class GlobalPropsDialog : public Dialog, public CommandSender
 {
   public:
     GlobalPropsDialog(GuiObject* boss, const GUI::Font& font);
-    virtual ~GlobalPropsDialog();
+    virtual ~GlobalPropsDialog() = default;
 
   private:
     int addHoldWidgets(const GUI::Font& font, int x, int y, WidgetArray& wid);

src/gui/GuiObject.hxx

@@ -68,7 +68,7 @@ class GuiObject : public CommandReceiver
         _dirty(false),
         _firstWidget(0) { }
 
-    virtual ~GuiObject() { }
+    virtual ~GuiObject() = default;
 
     OSystem& instance() const       { return myOSystem; }
     DialogContainer& parent() const { return myParent;  }

src/gui/HelpDialog.cxx

@@ -85,11 +85,6 @@ HelpDialog::HelpDialog(OSystem& osystem, DialogContainer& parent,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-HelpDialog::~HelpDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
 {

src/gui/HelpDialog.hxx

@@ -33,7 +33,7 @@ class HelpDialog : public Dialog
 {
   public:
     HelpDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font);
-    virtual ~HelpDialog();
+    virtual ~HelpDialog() = default;
 
   private:
     void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

src/gui/InputDialog.cxx

@@ -91,11 +91,6 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
   addBGroupToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-InputDialog::~InputDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void InputDialog::addDevicePortTab(const GUI::Font& font)
 {

src/gui/InputDialog.hxx

@@ -39,7 +39,7 @@ class InputDialog : public Dialog
   public:
     InputDialog(OSystem& osystem, DialogContainer& parent,
                 const GUI::Font& font, int max_w, int max_h);
-    virtual ~InputDialog();
+    virtual ~InputDialog() = default;
 
   private:
     void handleKeyDown(StellaKey key, StellaMod mod) override;

src/gui/InputTextDialog.cxx

@@ -55,11 +55,6 @@ InputTextDialog::InputTextDialog(GuiObject* boss, const GUI::Font& lfont,
   initialize(lfont, nfont, labels);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-InputTextDialog::~InputTextDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void InputTextDialog::initialize(const GUI::Font& lfont, const GUI::Font& nfont,
                                  const StringList& labels)

src/gui/InputTextDialog.hxx

@@ -35,7 +35,7 @@ class InputTextDialog : public Dialog, public CommandSender
                     const StringList& labels);
     InputTextDialog(GuiObject* boss, const GUI::Font& lfont,
                     const GUI::Font& nfont, const StringList& labels);
-    virtual ~InputTextDialog();
+    virtual ~InputTextDialog() = default;
 
     /** Place the input dialog onscreen and center it */
     void show();

src/gui/JoystickDialog.cxx

@@ -72,11 +72,6 @@ JoystickDialog::JoystickDialog(GuiObject* boss, const GUI::Font& font,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-JoystickDialog::~JoystickDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void JoystickDialog::loadConfig()
 {

src/gui/JoystickDialog.hxx

@@ -38,7 +38,7 @@ class JoystickDialog : public Dialog
   public:
     JoystickDialog(GuiObject* boss, const GUI::Font& font,
                    int max_w, int max_h);
-    virtual ~JoystickDialog();
+    virtual ~JoystickDialog() = default;
 
     /** Place the dialog onscreen and center it */
     void show() { open(); }

src/gui/Launcher.cxx

@@ -48,11 +48,6 @@ Launcher::Launcher(OSystem& osystem)
   myBaseDialog = new LauncherDialog(myOSystem, *this, 0, 0, myWidth, myHeight);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Launcher::~Launcher()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FBInitStatus Launcher::initializeVideo()
 {

src/gui/Launcher.hxx

@@ -44,7 +44,7 @@ class Launcher : public DialogContainer
     /**
       Destructor
     */
-    virtual ~Launcher();
+    virtual ~Launcher() = default;
 
     /**
       Initialize the video subsystem wrt this class.

src/gui/LauncherDialog.cxx

@@ -191,11 +191,6 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
   setListFilters();
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-LauncherDialog::~LauncherDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 const string& LauncherDialog::selectedRomMD5()
 {

src/gui/LauncherDialog.hxx

@@ -57,7 +57,7 @@ class LauncherDialog : public Dialog
   public:
     LauncherDialog(OSystem& osystem, DialogContainer& parent,
                    int x, int y, int w, int h);
-    virtual ~LauncherDialog();
+    virtual ~LauncherDialog() = default;
 
     /**
       Get MD5sum for the currently selected file

src/gui/LauncherFilterDialog.cxx

@@ -85,11 +85,6 @@ LauncherFilterDialog::LauncherFilterDialog(GuiObject* boss, const GUI::Font& fon
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-LauncherFilterDialog::~LauncherFilterDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void LauncherFilterDialog::parseExts(StringList& list, const string& type)
 {

src/gui/LauncherFilterDialog.hxx

@@ -35,7 +35,7 @@ class LauncherFilterDialog : public Dialog, public CommandSender
 {
   public:
     LauncherFilterDialog(GuiObject* boss, const GUI::Font& font);
-    virtual ~LauncherFilterDialog();
+    virtual ~LauncherFilterDialog() = default;
 
     /** Add valid extensions from 'exts' to the given StringList */
     static void parseExts(StringList& list, const string& exts);

src/gui/ListWidget.cxx

@@ -60,11 +60,6 @@ ListWidget::ListWidget(GuiObject* boss, const GUI::Font& font,
   _scrollBar->setTarget(this);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ListWidget::~ListWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ListWidget::setSelected(int item)
 {

src/gui/ListWidget.hxx

@@ -45,7 +45,7 @@ class ListWidget : public EditableWidget
   public:
     ListWidget(GuiObject* boss, const GUI::Font& font,
                int x, int y, int w, int h, bool quickSelect);
-    virtual ~ListWidget();
+    virtual ~ListWidget() = default;
 
     int rows() const        { return _rows; }
     int currentPos() const  { return _currentPos; }

src/gui/LoggerDialog.cxx

@@ -88,11 +88,6 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-LoggerDialog::~LoggerDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void LoggerDialog::loadConfig()
 {

src/gui/LoggerDialog.hxx

@@ -34,7 +34,7 @@ class LoggerDialog : public Dialog
   public:
     LoggerDialog(OSystem& osystem, DialogContainer& parent,
                  const GUI::Font& font, int max_w, int max_h);
-    virtual ~LoggerDialog();
+    virtual ~LoggerDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/Menu.cxx

@@ -32,8 +32,3 @@ Menu::Menu(OSystem& osystem)
   myBaseDialog = new OptionsDialog(myOSystem, *this, 0,
       FrameBuffer::kFBMinW, FrameBuffer::kFBMinH, false);
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Menu::~Menu()
-{
-}

src/gui/Menu.hxx

@@ -41,7 +41,7 @@ class Menu : public DialogContainer
     /**
       Destructor
     */
-    virtual ~Menu();
+    virtual ~Menu() = default;
 
   private:
     // Following constructors and assignment operators not supported

src/gui/MessageBox.cxx

@@ -58,11 +58,6 @@ MessageBox::MessageBox(GuiObject* boss, const GUI::Font& font,
   addToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-MessageBox::~MessageBox()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void MessageBox::addText(const GUI::Font& font, const StringList& text)
 {

src/gui/MessageBox.hxx

@@ -43,7 +43,7 @@ class MessageBox : public Dialog, public CommandSender
     MessageBox(GuiObject* boss, const GUI::Font& font, const string& text,
                int max_w, int max_h, int cmd = 0,
                const string& okText = "", const string& cancelText = "");
-    virtual ~MessageBox();
+    virtual ~MessageBox() = default;
 
     /** Place the input dialog onscreen and center it */
     void show() { open(); }

src/gui/OptionsDialog.cxx

@@ -146,11 +146,6 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
   }
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-OptionsDialog::~OptionsDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void OptionsDialog::loadConfig()
 {

src/gui/OptionsDialog.hxx

@@ -23,21 +23,21 @@
 class CommandSender;
 class DialogContainer;
 class GuiObject;
-class VideoDialog;
-class AudioDialog;
-class InputDialog;
-class UIDialog;
-class SnapshotDialog;
-class ConfigPathDialog;
-class RomAuditDialog;
-class GameInfoDialog;
-class CheatCodeDialog;
-class HelpDialog;
-class AboutDialog;
-class LoggerDialog;
 class OSystem;
 
 #include "Dialog.hxx"
+#include "VideoDialog.hxx"
+#include "AudioDialog.hxx"
+#include "InputDialog.hxx"
+#include "UIDialog.hxx"
+#include "SnapshotDialog.hxx"
+#include "ConfigPathDialog.hxx"
+#include "RomAuditDialog.hxx"
+#include "GameInfoDialog.hxx"
+#include "CheatCodeDialog.hxx"
+#include "HelpDialog.hxx"
+#include "AboutDialog.hxx"
+#include "LoggerDialog.hxx"
 #include "bspf.hxx"
 
 class OptionsDialog : public Dialog
@@ -45,7 +45,7 @@ class OptionsDialog : public Dialog
   public:
     OptionsDialog(OSystem& osystem, DialogContainer& parent, GuiObject* boss,
                   int max_w, int max_h, bool global);
-    virtual ~OptionsDialog();
+    virtual ~OptionsDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/PopUpWidget.cxx

@@ -64,11 +64,6 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font,
   myMenu = make_ptr<ContextMenu>(this, font, list, cmd);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-PopUpWidget::~PopUpWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void PopUpWidget::handleMouseDown(int x, int y, int button, int clickCount)
 {

src/gui/PopUpWidget.hxx

@@ -42,7 +42,7 @@ class PopUpWidget : public Widget, public CommandSender
     PopUpWidget(GuiObject* boss, const GUI::Font& font,
                 int x, int y, int w, int h, const VariantList& items,
                 const string& label, int labelWidth = 0, int cmd = 0);
-    ~PopUpWidget();
+    virtual ~PopUpWidget() = default;
 
     /** Add the given items to the widget. */
     void addItems(const VariantList& items) { myMenu->addItems(items);     }

src/gui/ProgressDialog.cxx

@@ -58,11 +58,6 @@ ProgressDialog::ProgressDialog(GuiObject* boss, const GUI::Font& font,
   open();
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ProgressDialog::~ProgressDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ProgressDialog::setMessage(const string& message)
 {

src/gui/ProgressDialog.hxx

@@ -31,7 +31,7 @@ class ProgressDialog : public Dialog
   public:
     ProgressDialog(GuiObject* boss, const GUI::Font& font,
                    const string& message);
-    virtual ~ProgressDialog();
+    virtual ~ProgressDialog() = default;
 
     void setMessage(const string& message);
     void setRange(int begin, int end, int step);

src/gui/RomAuditDialog.cxx

@@ -95,11 +95,6 @@ RomAuditDialog::RomAuditDialog(OSystem& osystem, DialogContainer& parent,
   myBrowser = make_ptr<BrowserDialog>(this, font, myMaxWidth, myMaxHeight);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RomAuditDialog::~RomAuditDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomAuditDialog::loadConfig()
 {

src/gui/RomAuditDialog.hxx

@@ -23,7 +23,6 @@
 class OSystem;
 class GuiObject;
 class DialogContainer;
-class BrowserDialog;
 class EditTextWidget;
 class StaticTextWidget;
 
@@ -31,13 +30,14 @@ class StaticTextWidget;
 #include "Command.hxx"
 #include "FSNode.hxx"
 #include "MessageBox.hxx"
+#include "BrowserDialog.hxx"
 
 class RomAuditDialog : public Dialog
 {
   public:
     RomAuditDialog(OSystem& osystem, DialogContainer& parent,
                    const GUI::Font& font, int max_w, int max_h);
-    virtual ~RomAuditDialog();
+    virtual ~RomAuditDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/RomInfoWidget.cxx

@@ -36,11 +36,6 @@ RomInfoWidget::RomInfoWidget(GuiObject* boss, const GUI::Font& font,
   _bgcolor = _bgcolorhi = kWidColor;
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RomInfoWidget::~RomInfoWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomInfoWidget::loadConfig()
 {

src/gui/RomInfoWidget.hxx

@@ -34,7 +34,7 @@ class RomInfoWidget : public Widget
   public:
     RomInfoWidget(GuiObject *boss, const GUI::Font& font,
                   int x, int y, int w, int h);
-    virtual ~RomInfoWidget();
+    virtual ~RomInfoWidget() = default;
 
     void setProperties(const Properties& props);
     void clearProperties();

src/gui/ScrollBarWidget.hxx

@@ -35,6 +35,7 @@ class ScrollBarWidget : public Widget, public CommandSender
   public:
     ScrollBarWidget(GuiObject* boss, const GUI::Font& font,
                     int x, int y, int w, int h);
+    virtual ~ScrollBarWidget() = default;
 
     void recalc();
     void handleMouseWheel(int x, int y, int direction) override;

src/gui/SnapshotDialog.cxx

@@ -131,11 +131,6 @@ SnapshotDialog::SnapshotDialog(
   myBrowser = make_ptr<BrowserDialog>(this, font, max_w, max_h);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SnapshotDialog::~SnapshotDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void SnapshotDialog::loadConfig()
 {

src/gui/SnapshotDialog.hxx

@@ -23,7 +23,6 @@
 class OSystem;
 class GuiObject;
 class DialogContainer;
-class BrowserDialog;
 class CheckboxWidget;
 class PopUpWidget;
 class EditTextWidget;
@@ -32,6 +31,7 @@ class StaticTextWidget;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
+#include "BrowserDialog.hxx"
 
 class SnapshotDialog : public Dialog
 {
@@ -39,7 +39,7 @@ class SnapshotDialog : public Dialog
     SnapshotDialog(OSystem& osystem, DialogContainer& parent,
                    const GUI::Font& font, GuiObject* boss,
                    int max_w, int max_h);
-    virtual ~SnapshotDialog();
+    virtual ~SnapshotDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/StringListWidget.cxx

@@ -31,11 +31,6 @@ StringListWidget::StringListWidget(GuiObject* boss, const GUI::Font& font,
 {
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-StringListWidget::~StringListWidget()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void StringListWidget::setList(const StringList& list)
 {

src/gui/StringListWidget.hxx

@@ -28,7 +28,7 @@ class StringListWidget : public ListWidget
   public:
     StringListWidget(GuiObject* boss, const GUI::Font& font,
                      int x, int y, int w, int h, bool hilite = true);
-    virtual ~StringListWidget();
+    virtual ~StringListWidget() = default;
 
     void setList(const StringList& list);
 

src/gui/UIDialog.cxx

@@ -303,11 +303,6 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
   addBGroupToFocusList(wid);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-UIDialog::~UIDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void UIDialog::loadConfig()
 {

src/gui/UIDialog.hxx

@@ -36,7 +36,7 @@ class UIDialog : public Dialog
 {
   public:
     UIDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font);
-    virtual ~UIDialog();
+    virtual ~UIDialog() = default;
 
   private:
     void loadConfig() override;

src/gui/VideoDialog.cxx

@@ -302,11 +302,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
 #endif
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-VideoDialog::~VideoDialog()
-{
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void VideoDialog::loadConfig()
 {

src/gui/VideoDialog.hxx

@@ -37,7 +37,7 @@ class VideoDialog : public Dialog
   public:
     VideoDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font,
                 int max_w, int max_h);
-    virtual ~VideoDialog();
+    virtual ~VideoDialog() = default;
 
   private:
     void loadConfig() override;