From e4c1f627e1456e4b4835d0131999bcefcb0c8f8d Mon Sep 17 00:00:00 2001 From: stephena Date: Tue, 29 Dec 2015 23:45:21 +0000 Subject: [PATCH] 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 | 6 ------ src/gui/AboutDialog.hxx | 2 +- src/gui/AudioDialog.cxx | 5 ----- src/gui/AudioDialog.hxx | 2 +- src/gui/BrowserDialog.cxx | 5 ----- src/gui/BrowserDialog.hxx | 2 +- src/gui/CheckListWidget.cxx | 5 ----- src/gui/CheckListWidget.hxx | 2 +- src/gui/ComboDialog.cxx | 5 ----- src/gui/ComboDialog.hxx | 2 +- src/gui/Command.hxx | 8 ++++---- src/gui/CommandDialog.cxx | 5 ----- src/gui/CommandDialog.hxx | 2 +- src/gui/CommandMenu.cxx | 5 ----- src/gui/CommandMenu.hxx | 2 +- src/gui/ConfigPathDialog.cxx | 5 ----- src/gui/ConfigPathDialog.hxx | 4 ++-- src/gui/ContextMenu.cxx | 5 ----- src/gui/ContextMenu.hxx | 2 +- src/gui/EditTextWidget.hxx | 1 + src/gui/EditableWidget.cxx | 5 ----- src/gui/EditableWidget.hxx | 2 +- src/gui/EventMappingWidget.cxx | 5 ----- src/gui/EventMappingWidget.hxx | 2 +- src/gui/FileListWidget.cxx | 5 ----- src/gui/FileListWidget.hxx | 2 +- src/gui/GameInfoDialog.cxx | 5 ----- src/gui/GameInfoDialog.hxx | 2 +- src/gui/GameList.hxx | 2 +- src/gui/GlobalPropsDialog.cxx | 5 ----- src/gui/GlobalPropsDialog.hxx | 2 +- src/gui/GuiObject.hxx | 2 +- src/gui/HelpDialog.cxx | 5 ----- src/gui/HelpDialog.hxx | 2 +- src/gui/InputDialog.cxx | 5 ----- src/gui/InputDialog.hxx | 2 +- src/gui/InputTextDialog.cxx | 5 ----- src/gui/InputTextDialog.hxx | 2 +- src/gui/JoystickDialog.cxx | 5 ----- src/gui/JoystickDialog.hxx | 2 +- src/gui/Launcher.cxx | 5 ----- src/gui/Launcher.hxx | 2 +- src/gui/LauncherDialog.cxx | 5 ----- src/gui/LauncherDialog.hxx | 2 +- src/gui/LauncherFilterDialog.cxx | 5 ----- src/gui/LauncherFilterDialog.hxx | 2 +- src/gui/ListWidget.cxx | 5 ----- src/gui/ListWidget.hxx | 2 +- src/gui/LoggerDialog.cxx | 5 ----- src/gui/LoggerDialog.hxx | 2 +- src/gui/Menu.cxx | 5 ----- src/gui/Menu.hxx | 2 +- src/gui/MessageBox.cxx | 5 ----- src/gui/MessageBox.hxx | 2 +- src/gui/OptionsDialog.cxx | 5 ----- src/gui/OptionsDialog.hxx | 26 +++++++++++++------------- src/gui/PopUpWidget.cxx | 5 ----- src/gui/PopUpWidget.hxx | 2 +- src/gui/ProgressDialog.cxx | 5 ----- src/gui/ProgressDialog.hxx | 2 +- src/gui/RomAuditDialog.cxx | 5 ----- src/gui/RomAuditDialog.hxx | 4 ++-- src/gui/RomInfoWidget.cxx | 5 ----- src/gui/RomInfoWidget.hxx | 2 +- src/gui/ScrollBarWidget.hxx | 1 + src/gui/SnapshotDialog.cxx | 5 ----- src/gui/SnapshotDialog.hxx | 4 ++-- src/gui/StringListWidget.cxx | 5 ----- src/gui/StringListWidget.hxx | 2 +- src/gui/UIDialog.cxx | 5 ----- src/gui/UIDialog.hxx | 2 +- src/gui/VideoDialog.cxx | 5 ----- src/gui/VideoDialog.hxx | 2 +- 73 files changed, 57 insertions(+), 226 deletions(-) diff --git a/src/gui/AboutDialog.cxx b/src/gui/AboutDialog.cxx index 6ba1bfaf8..be0f7f04c 100644 --- a/src/gui/AboutDialog.cxx +++ b/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: diff --git a/src/gui/AboutDialog.hxx b/src/gui/AboutDialog.hxx index 1207a86e3..d63f90462 100644 --- a/src/gui/AboutDialog.hxx +++ b/src/gui/AboutDialog.hxx @@ -32,7 +32,7 @@ class AboutDialog : public Dialog public: AboutDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font); - virtual ~AboutDialog(); + virtual ~AboutDialog() = default; private: void handleCommand(CommandSender* sender, int cmd, int data, int id) override; diff --git a/src/gui/AudioDialog.cxx b/src/gui/AudioDialog.cxx index 0ece8bc04..5c8ddc8a0 100644 --- a/src/gui/AudioDialog.cxx +++ b/src/gui/AudioDialog.cxx @@ -118,11 +118,6 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, addToFocusList(wid); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -AudioDialog::~AudioDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void AudioDialog::loadConfig() { diff --git a/src/gui/AudioDialog.hxx b/src/gui/AudioDialog.hxx index 9212d6481..694a67b82 100644 --- a/src/gui/AudioDialog.hxx +++ b/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; diff --git a/src/gui/BrowserDialog.cxx b/src/gui/BrowserDialog.cxx index 60eb8a0e2..7cf9fec39 100644 --- a/src/gui/BrowserDialog.cxx +++ b/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, diff --git a/src/gui/BrowserDialog.hxx b/src/gui/BrowserDialog.hxx index 77893081a..a1d0028a8 100644 --- a/src/gui/BrowserDialog.hxx +++ b/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, diff --git a/src/gui/CheckListWidget.cxx b/src/gui/CheckListWidget.cxx index 8a76d95ac..f1736caf7 100644 --- a/src/gui/CheckListWidget.cxx +++ b/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) { diff --git a/src/gui/CheckListWidget.hxx b/src/gui/CheckListWidget.hxx index 0966a18c6..1f357994a 100644 --- a/src/gui/CheckListWidget.hxx +++ b/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); diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx index f037837b7..ccf8747ed 100644 --- a/src/gui/ComboDialog.cxx +++ b/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) { diff --git a/src/gui/ComboDialog.hxx b/src/gui/ComboDialog.hxx index a48eb4df3..60c86f095 100644 --- a/src/gui/ComboDialog.hxx +++ b/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); diff --git a/src/gui/Command.hxx b/src/gui/Command.hxx index 623bf0ae6..c8ed6f1a4 100644 --- a/src/gui/Command.hxx +++ b/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; } diff --git a/src/gui/CommandDialog.cxx b/src/gui/CommandDialog.cxx index 5c96bc91b..d781db73a 100644 --- a/src/gui/CommandDialog.cxx +++ b/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) diff --git a/src/gui/CommandDialog.hxx b/src/gui/CommandDialog.hxx index 007e5ff16..598510009 100644 --- a/src/gui/CommandDialog.hxx +++ b/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; diff --git a/src/gui/CommandMenu.cxx b/src/gui/CommandMenu.cxx index 41928714b..7d1f142a3 100644 --- a/src/gui/CommandMenu.cxx +++ b/src/gui/CommandMenu.cxx @@ -27,8 +27,3 @@ CommandMenu::CommandMenu(OSystem& osystem) { myBaseDialog = new CommandDialog(myOSystem, *this); } - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -CommandMenu::~CommandMenu() -{ -} diff --git a/src/gui/CommandMenu.hxx b/src/gui/CommandMenu.hxx index 87b6aa05e..1bedc721e 100644 --- a/src/gui/CommandMenu.hxx +++ b/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 diff --git a/src/gui/ConfigPathDialog.cxx b/src/gui/ConfigPathDialog.cxx index 4ccc0dbbe..d769b5991 100644 --- a/src/gui/ConfigPathDialog.cxx +++ b/src/gui/ConfigPathDialog.cxx @@ -133,11 +133,6 @@ ConfigPathDialog::ConfigPathDialog( myBrowser = make_ptr(this, font, max_w, max_h); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ConfigPathDialog::~ConfigPathDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void ConfigPathDialog::loadConfig() { diff --git a/src/gui/ConfigPathDialog.hxx b/src/gui/ConfigPathDialog.hxx index 599a7d914..19d24fde6 100644 --- a/src/gui/ConfigPathDialog.hxx +++ b/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; diff --git a/src/gui/ContextMenu.cxx b/src/gui/ContextMenu.cxx index 09fc62e5f..f2c99664b 100644 --- a/src/gui/ContextMenu.cxx +++ b/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) { diff --git a/src/gui/ContextMenu.hxx b/src/gui/ContextMenu.hxx index 55027f17e..386c399dd 100644 --- a/src/gui/ContextMenu.hxx +++ b/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); diff --git a/src/gui/EditTextWidget.hxx b/src/gui/EditTextWidget.hxx index beb8ffd63..d857105c2 100644 --- a/src/gui/EditTextWidget.hxx +++ b/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; diff --git a/src/gui/EditableWidget.cxx b/src/gui/EditableWidget.cxx index eb4e1481b..d94171e45 100644 --- a/src/gui/EditableWidget.cxx +++ b/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) { diff --git a/src/gui/EditableWidget.hxx b/src/gui/EditableWidget.hxx index 3ff57ca06..5373157ba 100644 --- a/src/gui/EditableWidget.hxx +++ b/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; } diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx index d449c231b..6a7b54c8c 100644 --- a/src/gui/EventMappingWidget.cxx +++ b/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() { diff --git a/src/gui/EventMappingWidget.hxx b/src/gui/EventMappingWidget.hxx index 378253d56..ed615d42a 100644 --- a/src/gui/EventMappingWidget.hxx +++ b/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; } diff --git a/src/gui/FileListWidget.cxx b/src/gui/FileListWidget.cxx index 2f63399bb..9c73a982c 100644 --- a/src/gui/FileListWidget.cxx +++ b/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) { diff --git a/src/gui/FileListWidget.hxx b/src/gui/FileListWidget.hxx index 5c4df7d57..c57e32eda 100644 --- a/src/gui/FileListWidget.hxx +++ b/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; } diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 06ae08c16..ac854db59 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -366,11 +366,6 @@ GameInfoDialog::GameInfoDialog( addBGroupToFocusList(wid); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -GameInfoDialog::~GameInfoDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void GameInfoDialog::loadConfig() { diff --git a/src/gui/GameInfoDialog.hxx b/src/gui/GameInfoDialog.hxx index 776562dce..74db9f7af 100644 --- a/src/gui/GameInfoDialog.hxx +++ b/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; diff --git a/src/gui/GameList.hxx b/src/gui/GameList.hxx index a7b01be77..15e27877e 100644 --- a/src/gui/GameList.hxx +++ b/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; } diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx index 0001cc387..58aaa9faf 100644 --- a/src/gui/GlobalPropsDialog.cxx +++ b/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) diff --git a/src/gui/GlobalPropsDialog.hxx b/src/gui/GlobalPropsDialog.hxx index b5a1275ad..31c1a15a1 100644 --- a/src/gui/GlobalPropsDialog.hxx +++ b/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); diff --git a/src/gui/GuiObject.hxx b/src/gui/GuiObject.hxx index 5951e5958..f4a9458fe 100644 --- a/src/gui/GuiObject.hxx +++ b/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; } diff --git a/src/gui/HelpDialog.cxx b/src/gui/HelpDialog.cxx index 9935b664b..dabe81771 100644 --- a/src/gui/HelpDialog.cxx +++ b/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) { diff --git a/src/gui/HelpDialog.hxx b/src/gui/HelpDialog.hxx index d3f848874..420cbbea4 100644 --- a/src/gui/HelpDialog.hxx +++ b/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; diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index a72abc4eb..b34fc548a 100644 --- a/src/gui/InputDialog.cxx +++ b/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) { diff --git a/src/gui/InputDialog.hxx b/src/gui/InputDialog.hxx index f65a588f4..8a3c18238 100644 --- a/src/gui/InputDialog.hxx +++ b/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; diff --git a/src/gui/InputTextDialog.cxx b/src/gui/InputTextDialog.cxx index c8712bd22..07e5551a1 100644 --- a/src/gui/InputTextDialog.cxx +++ b/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) diff --git a/src/gui/InputTextDialog.hxx b/src/gui/InputTextDialog.hxx index e80bca2d0..7b07fcb0c 100644 --- a/src/gui/InputTextDialog.hxx +++ b/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(); diff --git a/src/gui/JoystickDialog.cxx b/src/gui/JoystickDialog.cxx index 38f13f4d0..cc6e81052 100644 --- a/src/gui/JoystickDialog.cxx +++ b/src/gui/JoystickDialog.cxx @@ -72,11 +72,6 @@ JoystickDialog::JoystickDialog(GuiObject* boss, const GUI::Font& font, addToFocusList(wid); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -JoystickDialog::~JoystickDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void JoystickDialog::loadConfig() { diff --git a/src/gui/JoystickDialog.hxx b/src/gui/JoystickDialog.hxx index f963259f5..3d138b0a2 100644 --- a/src/gui/JoystickDialog.hxx +++ b/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(); } diff --git a/src/gui/Launcher.cxx b/src/gui/Launcher.cxx index 0c6a642b3..d2ddcd130 100644 --- a/src/gui/Launcher.cxx +++ b/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() { diff --git a/src/gui/Launcher.hxx b/src/gui/Launcher.hxx index ea559aa06..a473675a2 100644 --- a/src/gui/Launcher.hxx +++ b/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. diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index fd6f9e176..f4160e765 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -191,11 +191,6 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, setListFilters(); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -LauncherDialog::~LauncherDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - const string& LauncherDialog::selectedRomMD5() { diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx index 90d243c7d..6d4e5044e 100644 --- a/src/gui/LauncherDialog.hxx +++ b/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 diff --git a/src/gui/LauncherFilterDialog.cxx b/src/gui/LauncherFilterDialog.cxx index 6e284fbbc..60b37e7e2 100644 --- a/src/gui/LauncherFilterDialog.cxx +++ b/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) { diff --git a/src/gui/LauncherFilterDialog.hxx b/src/gui/LauncherFilterDialog.hxx index 4b42e6fd6..6ffec730d 100644 --- a/src/gui/LauncherFilterDialog.hxx +++ b/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); diff --git a/src/gui/ListWidget.cxx b/src/gui/ListWidget.cxx index 33b196e71..33a5b59c2 100644 --- a/src/gui/ListWidget.cxx +++ b/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) { diff --git a/src/gui/ListWidget.hxx b/src/gui/ListWidget.hxx index a48159731..7098c419b 100644 --- a/src/gui/ListWidget.hxx +++ b/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; } diff --git a/src/gui/LoggerDialog.cxx b/src/gui/LoggerDialog.cxx index 7ede7354d..2eabbef96 100644 --- a/src/gui/LoggerDialog.cxx +++ b/src/gui/LoggerDialog.cxx @@ -88,11 +88,6 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent, addToFocusList(wid); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -LoggerDialog::~LoggerDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void LoggerDialog::loadConfig() { diff --git a/src/gui/LoggerDialog.hxx b/src/gui/LoggerDialog.hxx index 9b237ad08..e4ab73f7d 100644 --- a/src/gui/LoggerDialog.hxx +++ b/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; diff --git a/src/gui/Menu.cxx b/src/gui/Menu.cxx index ef156eac4..27857ad8b 100644 --- a/src/gui/Menu.cxx +++ b/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() -{ -} diff --git a/src/gui/Menu.hxx b/src/gui/Menu.hxx index 699b0ea38..c911a0534 100644 --- a/src/gui/Menu.hxx +++ b/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 diff --git a/src/gui/MessageBox.cxx b/src/gui/MessageBox.cxx index 8786f4a4f..541bee70a 100644 --- a/src/gui/MessageBox.cxx +++ b/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) { diff --git a/src/gui/MessageBox.hxx b/src/gui/MessageBox.hxx index fde09d2e6..8640d5c42 100644 --- a/src/gui/MessageBox.hxx +++ b/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(); } diff --git a/src/gui/OptionsDialog.cxx b/src/gui/OptionsDialog.cxx index 093b07af8..fbc556906 100644 --- a/src/gui/OptionsDialog.cxx +++ b/src/gui/OptionsDialog.cxx @@ -146,11 +146,6 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent, } } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -OptionsDialog::~OptionsDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void OptionsDialog::loadConfig() { diff --git a/src/gui/OptionsDialog.hxx b/src/gui/OptionsDialog.hxx index 6da5def53..ba83502d1 100644 --- a/src/gui/OptionsDialog.hxx +++ b/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; diff --git a/src/gui/PopUpWidget.cxx b/src/gui/PopUpWidget.cxx index 3602789d4..4c8466170 100644 --- a/src/gui/PopUpWidget.cxx +++ b/src/gui/PopUpWidget.cxx @@ -64,11 +64,6 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font, myMenu = make_ptr(this, font, list, cmd); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -PopUpWidget::~PopUpWidget() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void PopUpWidget::handleMouseDown(int x, int y, int button, int clickCount) { diff --git a/src/gui/PopUpWidget.hxx b/src/gui/PopUpWidget.hxx index 9e38d6cf3..04e670911 100644 --- a/src/gui/PopUpWidget.hxx +++ b/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); } diff --git a/src/gui/ProgressDialog.cxx b/src/gui/ProgressDialog.cxx index be4c0ba68..f27a1090f 100644 --- a/src/gui/ProgressDialog.cxx +++ b/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) { diff --git a/src/gui/ProgressDialog.hxx b/src/gui/ProgressDialog.hxx index c543522ae..667665f6c 100644 --- a/src/gui/ProgressDialog.hxx +++ b/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); diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index 6ecff6ce7..1692eae44 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -95,11 +95,6 @@ RomAuditDialog::RomAuditDialog(OSystem& osystem, DialogContainer& parent, myBrowser = make_ptr(this, font, myMaxWidth, myMaxHeight); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -RomAuditDialog::~RomAuditDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void RomAuditDialog::loadConfig() { diff --git a/src/gui/RomAuditDialog.hxx b/src/gui/RomAuditDialog.hxx index 23a864f61..395d7a43d 100644 --- a/src/gui/RomAuditDialog.hxx +++ b/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; diff --git a/src/gui/RomInfoWidget.cxx b/src/gui/RomInfoWidget.cxx index 35a2b1340..509bf0556 100644 --- a/src/gui/RomInfoWidget.cxx +++ b/src/gui/RomInfoWidget.cxx @@ -36,11 +36,6 @@ RomInfoWidget::RomInfoWidget(GuiObject* boss, const GUI::Font& font, _bgcolor = _bgcolorhi = kWidColor; } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -RomInfoWidget::~RomInfoWidget() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void RomInfoWidget::loadConfig() { diff --git a/src/gui/RomInfoWidget.hxx b/src/gui/RomInfoWidget.hxx index 7dd3bb456..83bea0086 100644 --- a/src/gui/RomInfoWidget.hxx +++ b/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(); diff --git a/src/gui/ScrollBarWidget.hxx b/src/gui/ScrollBarWidget.hxx index 3fcd4f2ca..c7abe95ff 100644 --- a/src/gui/ScrollBarWidget.hxx +++ b/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; diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 795238897..4eb50197b 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -131,11 +131,6 @@ SnapshotDialog::SnapshotDialog( myBrowser = make_ptr(this, font, max_w, max_h); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SnapshotDialog::~SnapshotDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void SnapshotDialog::loadConfig() { diff --git a/src/gui/SnapshotDialog.hxx b/src/gui/SnapshotDialog.hxx index 2fc928638..6054f28bc 100644 --- a/src/gui/SnapshotDialog.hxx +++ b/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; diff --git a/src/gui/StringListWidget.cxx b/src/gui/StringListWidget.cxx index 5a355b275..3b890577a 100644 --- a/src/gui/StringListWidget.cxx +++ b/src/gui/StringListWidget.cxx @@ -31,11 +31,6 @@ StringListWidget::StringListWidget(GuiObject* boss, const GUI::Font& font, { } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -StringListWidget::~StringListWidget() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void StringListWidget::setList(const StringList& list) { diff --git a/src/gui/StringListWidget.hxx b/src/gui/StringListWidget.hxx index 030b3d248..e8c7a53cd 100644 --- a/src/gui/StringListWidget.hxx +++ b/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); diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index 4f2911e50..5bf8ea7cb 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -303,11 +303,6 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, addBGroupToFocusList(wid); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -UIDialog::~UIDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void UIDialog::loadConfig() { diff --git a/src/gui/UIDialog.hxx b/src/gui/UIDialog.hxx index a47762fe1..2e9dba688 100644 --- a/src/gui/UIDialog.hxx +++ b/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; diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index c7867ce41..dcf2da8f3 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -302,11 +302,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, #endif } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -VideoDialog::~VideoDialog() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void VideoDialog::loadConfig() { diff --git a/src/gui/VideoDialog.hxx b/src/gui/VideoDialog.hxx index abab646ce..013abe709 100644 --- a/src/gui/VideoDialog.hxx +++ b/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;