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
This commit is contained in:
stephena 2015-12-29 22:39:08 +00:00
parent ac98c97bb5
commit f279eac86f
100 changed files with 74 additions and 211 deletions

View File

@ -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()
{

View File

@ -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; }

View File

@ -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;

View File

@ -222,11 +222,6 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
disasm(myOffset, 3);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DiStella::~DiStella()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DiStella::disasm(uInt32 distart, int pass)
{

View File

@ -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

View File

@ -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; }

View File

@ -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;

View File

@ -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)
{

View File

@ -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

View File

@ -73,11 +73,6 @@ BoosterWidget::BoosterWidget(GuiObject* boss, const GUI::Font& font,
myPins[kJTrigger]->setTarget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BoosterWidget::~BoosterWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void BoosterWidget::loadConfig()
{

View File

@ -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 };

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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,

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -83,11 +83,6 @@ CartRamWidget::CartRamWidget(
addToFocusList(myRam->getFocusList());
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartRamWidget::~CartRamWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartRamWidget::loadConfig()
{

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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)
{

View File

@ -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; }

View File

@ -39,7 +39,7 @@ class ControllerWidget : public Widget, public CommandSender
_h = 8 * font.getLineHeight();
}
virtual ~ControllerWidget() { }
virtual ~ControllerWidget() = default;
virtual void loadConfig() override { }

View File

@ -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)
{

View File

@ -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;

View File

@ -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);

View File

@ -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)

View File

@ -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);

View File

@ -63,11 +63,6 @@ DebuggerDialog::DebuggerDialog(OSystem& osystem, DialogContainer& parent,
myTiaOutput->setZoomWidget(myTiaZoom);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DebuggerDialog::~DebuggerDialog()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DebuggerDialog::loadConfig()
{

View File

@ -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; }

View File

@ -59,11 +59,6 @@ DrivingWidget::DrivingWidget(GuiObject* boss, const GUI::Font& font,
myFire->setTarget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DrivingWidget::~DrivingWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DrivingWidget::loadConfig()
{

View File

@ -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 {

View File

@ -68,11 +68,6 @@ GenesisWidget::GenesisWidget(GuiObject* boss, const GUI::Font& font,
myPins[kJCbtn]->setTarget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GenesisWidget::~GenesisWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void GenesisWidget::loadConfig()
{

View File

@ -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 };

View File

@ -63,11 +63,6 @@ JoystickWidget::JoystickWidget(GuiObject* boss, const GUI::Font& font,
myPins[kJFire]->setTarget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
JoystickWidget::~JoystickWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void JoystickWidget::loadConfig()
{

View File

@ -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 };

View File

@ -53,11 +53,6 @@ KeyboardWidget::KeyboardWidget(GuiObject* boss, const GUI::Font& font,
myEvent = leftport ? ourLeftEvents : ourRightEvents;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KeyboardWidget::~KeyboardWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void KeyboardWidget::loadConfig()
{

View File

@ -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];

View File

@ -48,7 +48,7 @@ class NullControlWidget : public ControllerWidget
kTextAlignCenter);
}
virtual ~NullControlWidget() { }
virtual ~NullControlWidget() = default;
private:
// Following constructors and assignment operators not supported

View File

@ -67,11 +67,6 @@ PaddleWidget::PaddleWidget(GuiObject* boss, const GUI::Font& font,
myP1Fire->setTarget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PaddleWidget::~PaddleWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PaddleWidget::loadConfig()
{

View File

@ -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',

View File

@ -69,11 +69,6 @@ PromptWidget::PromptWidget(GuiObject* boss, const GUI::Font& font,
addFocusWidget(this);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PromptWidget::~PromptWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PromptWidget::drawWidget(bool hilite)
{

View File

@ -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, ...);

View File

@ -30,11 +30,6 @@ RiotRamWidget::RiotRamWidget(GuiObject* boss, const GUI::Font& lfont,
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RiotRamWidget::~RiotRamWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 RiotRamWidget::getValue(int addr) const
{

View File

@ -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;

View File

@ -244,11 +244,6 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont,
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RiotWidget::~RiotWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RiotWidget::loadConfig()
{

View File

@ -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,

View File

@ -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)
{

View File

@ -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) */

View File

@ -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)

View File

@ -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);

View File

@ -61,11 +61,6 @@ RomWidget::RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
addFocusWidget(myRomList);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RomWidget::~RomWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RomWidget::loadConfig()
{

View File

@ -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(); }

View File

@ -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;

View File

@ -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)
{

View File

@ -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;

View File

@ -52,11 +52,6 @@ TiaOutputWidget::TiaOutputWidget(GuiObject* boss, const GUI::Font& font,
myMenu = make_ptr<ContextMenu>(this, font, l);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TiaOutputWidget::~TiaOutputWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TiaOutputWidget::loadConfig()
{

View File

@ -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; }

View File

@ -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)
{

View File

@ -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;

View File

@ -60,11 +60,6 @@ TiaZoomWidget::TiaZoomWidget(GuiObject* boss, const GUI::Font& font,
myMenu = make_ptr<ContextMenu>(this, font, l);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TiaZoomWidget::~TiaZoomWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TiaZoomWidget::loadConfig()
{

View File

@ -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);

View File

@ -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)
{

View File

@ -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);

View File

@ -43,11 +43,6 @@ TogglePixelWidget::TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
_changedList.push_back(false);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TogglePixelWidget::~TogglePixelWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TogglePixelWidget::setState(const BoolArray& state)
{

View File

@ -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;

View File

@ -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)
{

View File

@ -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]; }