Fixed the last remaining C++11 "= default" for d'tors.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3244 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2015-12-30 19:07:11 +00:00
parent e4c1f627e1
commit 5ec561a191
25 changed files with 25 additions and 79 deletions

View File

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

View File

@ -27,18 +27,18 @@ class ButtonWidget;
class StaticTextWidget;
class CheckListWidget;
class EditTextWidget;
class InputTextDialog;
class OptionsDialog;
class OSystem;
#include "Dialog.hxx"
#include "InputTextDialog.hxx"
class CheatCodeDialog : public Dialog
{
public:
CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font);
virtual ~CheatCodeDialog();
virtual ~CheatCodeDialog() = default;
protected:
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

View File

@ -134,11 +134,6 @@ Debugger::Debugger(OSystem& osystem, Console& console)
myStaticDebugger = this;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Debugger::~Debugger()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Debugger::initialize()
{

View File

@ -22,10 +22,6 @@
class OSystem;
class Console;
class CartDebug;
class CpuDebug;
class RiotDebug;
class TIADebug;
class TiaInfoWidget;
class TiaOutputWidget;
class TiaZoomWidget;
@ -46,6 +42,10 @@ class ButtonWidget;
#include "M6502.hxx"
#include "System.hxx"
#include "Stack.hxx"
#include "CartDebug.hxx"
#include "CpuDebug.hxx"
#include "RiotDebug.hxx"
#include "TIADebug.hxx"
#include "bspf.hxx"
using FunctionMap = map<string,unique_ptr<Expression>>;
@ -76,7 +76,7 @@ class Debugger : public DialogContainer
/**
Destructor
*/
virtual ~Debugger();
virtual ~Debugger() = default;
public:
/**

View File

@ -159,11 +159,6 @@ RamWidget::RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
if(_h == 0) _h = ypos + myLineHeight - y;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RamWidget::~RamWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
{

View File

@ -21,7 +21,6 @@
#define RAM_WIDGET_HXX
class GuiObject;
class InputTextDialog;
class ButtonWidget;
class DataGridWidget;
class DataGridOpsWidget;
@ -30,6 +29,7 @@ class StaticTextWidget;
#include "Widget.hxx"
#include "Command.hxx"
#include "InputTextDialog.hxx"
class RamWidget : public Widget, public CommandSender
{
@ -37,7 +37,7 @@ class RamWidget : public Widget, public CommandSender
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h,
uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
virtual ~RamWidget();
virtual ~RamWidget() = default;
void loadConfig() override;
void setOpsWidget(DataGridOpsWidget* w);

View File

@ -45,11 +45,6 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AtariVox::~AtariVox()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool AtariVox::read(DigitalPin pin)
{

View File

@ -21,9 +21,9 @@
#define ATARIVOX_HXX
class SerialPort;
class MT24LC256;
#include "Control.hxx"
#include "MT24LC256.hxx"
/**
Richard Hutchinson's AtariVox "controller": A speech synthesizer and
@ -57,7 +57,7 @@ class AtariVox : public Controller
/**
Destructor
*/
virtual ~AtariVox();
virtual ~AtariVox() = default;
public:
using Controller::read;

View File

@ -231,10 +231,12 @@ void KidVid::setNextSong()
mySharedData = (temp < 10);
mySongCounter = ourSongStart[temp+1] - ourSongStart[temp];
#if 0
if(mySharedData)
; // fseek(mySharedSampleFile, ourSongStart[temp], SEEK_SET);
else
; // fseek(mySampleFile, ourSongStart[temp], SEEK_SET);
#endif
myFilePointer++;
myTapeBusy = true;

View File

@ -32,11 +32,6 @@ SaveKey::SaveKey(Jack jack, const Event& event, const System& system,
myAnalogPinValue[Five] = myAnalogPinValue[Nine] = maximumResistance;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SaveKey::~SaveKey()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SaveKey::read(DigitalPin pin)
{

View File

@ -20,9 +20,8 @@
#ifndef SAVEKEY_HXX
#define SAVEKEY_HXX
class MT24LC256;
#include "Control.hxx"
#include "MT24LC256.hxx"
/**
Richard Hutchinson's SaveKey "controller", consisting of a 32KB EEPROM
@ -53,7 +52,7 @@ class SaveKey : public Controller
/**
Destructor
*/
virtual ~SaveKey();
virtual ~SaveKey() = default;
public:
using Controller::read;

View File

@ -33,8 +33,8 @@
class SerialPort
{
public:
SerialPort() { }
virtual ~SerialPort() { }
SerialPort() = default;
virtual ~SerialPort() = default;
/**
Open the given serial port with the specified attributes.

View File

@ -33,8 +33,8 @@
class Serializable
{
public:
Serializable() { }
virtual ~Serializable() { }
Serializable() = default;
virtual ~Serializable() = default;
/**
Save the current state of the object to the given Serializer.

View File

@ -40,11 +40,6 @@ OSystemMACOSX::OSystemMACOSX()
setConfigFile("~/Library/Application Support/Stella/stellarc");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemMACOSX::~OSystemMACOSX()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemMACOSX::defaultSnapSaveDir()
{

View File

@ -39,7 +39,7 @@ class OSystemMACOSX : public OSystem
/**
Destructor
*/
virtual ~OSystemMACOSX();
virtual ~OSystemMACOSX() = default;
/**
Returns the default paths for the snapshot directory.

View File

@ -31,11 +31,6 @@ SettingsMACOSX::SettingsMACOSX(OSystem& osystem)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsMACOSX::~SettingsMACOSX()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SettingsMACOSX::loadConfig()
{

View File

@ -41,7 +41,7 @@ class SettingsMACOSX : public Settings
/**
Destructor
*/
virtual ~SettingsMACOSX();
virtual ~SettingsMACOSX() = default;
public:
/**

View File

@ -36,8 +36,3 @@ OSystemUNIX::OSystemUNIX()
setBaseDir("~/.stella");
setConfigFile("~/.stella/stellarc");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemUNIX::~OSystemUNIX()
{
}

View File

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

View File

@ -24,8 +24,3 @@ SettingsUNIX::SettingsUNIX(OSystem& osystem)
: Settings(osystem)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsUNIX::~SettingsUNIX()
{
}

View File

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

View File

@ -83,11 +83,6 @@ OSystemWINDOWS::OSystemWINDOWS()
setConfigFile(basedir + "\\stella.ini");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemWINDOWS::~OSystemWINDOWS()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemWINDOWS::defaultSnapSaveDir()
{

View File

@ -39,7 +39,7 @@ class OSystemWINDOWS : public OSystem
/**
Destructor
*/
virtual ~OSystemWINDOWS();
virtual ~OSystemWINDOWS() = default;
public:
/**

View File

@ -25,8 +25,3 @@ SettingsWINDOWS::SettingsWINDOWS(OSystem& osystem)
{
setInternal("fragsize", "1024");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsWINDOWS::~SettingsWINDOWS()
{
}

View File

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