core/gui: use = default instead of trivial constructor/destructor

reported by clang-tidy

Note: drop throw() specifier as it is the 'default' in C++11 for
destructor
This commit is contained in:
Gregory Hainaut 2017-05-06 13:01:33 +02:00
parent 9e101c9ef0
commit d332bb1645
28 changed files with 69 additions and 117 deletions

View File

@ -113,7 +113,7 @@ protected:
public: public:
using _parent::operator[]; using _parent::operator[];
virtual ~CommandDictionary() throw(); virtual ~CommandDictionary() = default;
}; };
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -128,6 +128,6 @@ protected:
public: public:
using _parent::operator[]; using _parent::operator[];
virtual ~AcceleratorDictionary() throw(); virtual ~AcceleratorDictionary() = default;
void Map( const KeyAcceleratorCode& acode, const char *searchfor ); void Map( const KeyAcceleratorCode& acode, const char *searchfor );
}; };

View File

@ -1175,7 +1175,7 @@ protected:
wxString m_empty; wxString m_empty;
public: public:
virtual ~pxDudConfig() {} virtual ~pxDudConfig() = default;
virtual void SetPath(const wxString& ) {} virtual void SetPath(const wxString& ) {}
virtual const wxString& GetPath() const { return m_empty; } virtual const wxString& GetPath() const { return m_empty; }
@ -1222,14 +1222,14 @@ class AppIniSaver : public IniSaver
{ {
public: public:
AppIniSaver(); AppIniSaver();
virtual ~AppIniSaver() throw() {} virtual ~AppIniSaver() = default;
}; };
class AppIniLoader : public IniLoader class AppIniLoader : public IniLoader
{ {
public: public:
AppIniLoader(); AppIniLoader();
virtual ~AppIniLoader() throw() {} virtual ~AppIniLoader() = default;
}; };
AppIniSaver::AppIniSaver() AppIniSaver::AppIniSaver()

View File

@ -50,7 +50,7 @@ protected:
PluginEventType m_evt; PluginEventType m_evt;
public: public:
virtual ~CorePluginsEvent() throw() {} virtual ~CorePluginsEvent() = default;
CorePluginsEvent* Clone() const { return new CorePluginsEvent( *this ); } CorePluginsEvent* Clone() const { return new CorePluginsEvent( *this ); }
explicit CorePluginsEvent( PluginEventType evt, SynchronousActionState* sema=NULL ) explicit CorePluginsEvent( PluginEventType evt, SynchronousActionState* sema=NULL )
@ -110,7 +110,7 @@ protected:
public: public:
wxString GetEventName() const { return L"CorePluginsMethod"; } wxString GetEventName() const { return L"CorePluginsMethod"; }
virtual ~SysExecEvent_AppPluginManager() throw() {} virtual ~SysExecEvent_AppPluginManager() = default;
SysExecEvent_AppPluginManager* Clone() const { return new SysExecEvent_AppPluginManager( *this ); } SysExecEvent_AppPluginManager* Clone() const { return new SysExecEvent_AppPluginManager( *this ); }
SysExecEvent_AppPluginManager( FnPtr_AppPluginManager method ) SysExecEvent_AppPluginManager( FnPtr_AppPluginManager method )
@ -138,7 +138,7 @@ protected:
PluginsEnum_t m_pid; PluginsEnum_t m_pid;
public: public:
virtual ~LoadSinglePluginEvent() throw() { } virtual ~LoadSinglePluginEvent() = default;
virtual LoadSinglePluginEvent *Clone() const { return new LoadSinglePluginEvent(*this); } virtual LoadSinglePluginEvent *Clone() const { return new LoadSinglePluginEvent(*this); }
LoadSinglePluginEvent( PluginsEnum_t pid = PluginId_GS, const wxString& filename=wxEmptyString ) LoadSinglePluginEvent( PluginsEnum_t pid = PluginId_GS, const wxString& filename=wxEmptyString )
@ -167,7 +167,7 @@ protected:
FnPtr_AppPluginPid m_method; FnPtr_AppPluginPid m_method;
public: public:
virtual ~SinglePluginMethodEvent() throw() { } virtual ~SinglePluginMethodEvent() = default;
virtual SinglePluginMethodEvent *Clone() const { return new SinglePluginMethodEvent(*this); } virtual SinglePluginMethodEvent *Clone() const { return new SinglePluginMethodEvent(*this); }
SinglePluginMethodEvent( FnPtr_AppPluginPid method=NULL, PluginsEnum_t pid = PluginId_GS ) SinglePluginMethodEvent( FnPtr_AppPluginPid method=NULL, PluginsEnum_t pid = PluginId_GS )
@ -203,13 +203,6 @@ IMPLEMENT_DYNAMIC_CLASS( SinglePluginMethodEvent, pxActionEvent );
// the main thread from being completely busy while plugins are loaded and initialized. // the main thread from being completely busy while plugins are loaded and initialized.
// (responsiveness is bliss!!) -- air // (responsiveness is bliss!!) -- air
// //
AppCorePlugins::AppCorePlugins()
{
}
AppCorePlugins::~AppCorePlugins() throw()
{
}
static void _SetSettingsFolder() static void _SetSettingsFolder()
{ {
@ -409,7 +402,7 @@ protected:
{ {
CorePlugins.Load( m_folders ); CorePlugins.Load( m_folders );
} }
~LoadCorePluginsEvent() throw() {} ~LoadCorePluginsEvent() = default;
}; };
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -507,7 +500,7 @@ class SysExecEvent_UnloadPlugins : public SysExecEvent
public: public:
wxString GetEventName() const { return L"UnloadPlugins"; } wxString GetEventName() const { return L"UnloadPlugins"; }
virtual ~SysExecEvent_UnloadPlugins() throw() {} virtual ~SysExecEvent_UnloadPlugins() = default;
SysExecEvent_UnloadPlugins* Clone() const { return new SysExecEvent_UnloadPlugins(*this); } SysExecEvent_UnloadPlugins* Clone() const { return new SysExecEvent_UnloadPlugins(*this); }
virtual bool AllowCancelOnExit() const { return false; } virtual bool AllowCancelOnExit() const { return false; }
@ -525,7 +518,7 @@ class SysExecEvent_ShutdownPlugins : public SysExecEvent
public: public:
wxString GetEventName() const { return L"ShutdownPlugins"; } wxString GetEventName() const { return L"ShutdownPlugins"; }
virtual ~SysExecEvent_ShutdownPlugins() throw() {} virtual ~SysExecEvent_ShutdownPlugins() = default;
SysExecEvent_ShutdownPlugins* Clone() const { return new SysExecEvent_ShutdownPlugins(*this); } SysExecEvent_ShutdownPlugins* Clone() const { return new SysExecEvent_ShutdownPlugins(*this); }
virtual bool AllowCancelOnExit() const { return false; } virtual bool AllowCancelOnExit() const { return false; }

View File

@ -31,8 +31,8 @@ class AppCorePlugins : public SysCorePlugins
typedef SysCorePlugins _parent; typedef SysCorePlugins _parent;
public: public:
AppCorePlugins(); AppCorePlugins() = default;
virtual ~AppCorePlugins() throw(); virtual ~AppCorePlugins() = default;
void Load( const wxString (&folders)[PluginId_Count] ); void Load( const wxString (&folders)[PluginId_Count] );
void Load( PluginsEnum_t pid, const wxString& srcfile ); void Load( PluginsEnum_t pid, const wxString& srcfile );

View File

@ -49,7 +49,7 @@ protected:
public: public:
wxString GetEventName() const { return L"CoreThreadMethod"; } wxString GetEventName() const { return L"CoreThreadMethod"; }
virtual ~SysExecEvent_InvokeCoreThreadMethod() throw() {} virtual ~SysExecEvent_InvokeCoreThreadMethod() = default;
SysExecEvent_InvokeCoreThreadMethod* Clone() const { return new SysExecEvent_InvokeCoreThreadMethod(*this); } SysExecEvent_InvokeCoreThreadMethod* Clone() const { return new SysExecEvent_InvokeCoreThreadMethod(*this); }
bool AllowCancelOnExit() const { return false; } bool AllowCancelOnExit() const { return false; }
@ -708,9 +708,7 @@ BaseScopedCoreThread::BaseScopedCoreThread()
m_alreadyScoped = false; m_alreadyScoped = false;
} }
BaseScopedCoreThread::~BaseScopedCoreThread() throw() BaseScopedCoreThread::~BaseScopedCoreThread() throw() = default;
{
}
// Allows the object to resume execution upon object destruction. Typically called as the last thing // Allows the object to resume execution upon object destruction. Typically called as the last thing
// in the object's scope. Any code prior to this call that causes exceptions will not resume the emulator, // in the object's scope. Any code prior to this call that causes exceptions will not resume the emulator,

View File

@ -95,7 +95,7 @@ public:
PluginErrorEvent( BaseException* ex=NULL ) : _parent( ex ) {} PluginErrorEvent( BaseException* ex=NULL ) : _parent( ex ) {}
PluginErrorEvent( const BaseException& ex ) : _parent( ex ) {} PluginErrorEvent( const BaseException& ex ) : _parent( ex ) {}
virtual ~PluginErrorEvent() throw() { } virtual ~PluginErrorEvent() = default;
virtual PluginErrorEvent *Clone() const { return new PluginErrorEvent(*this); } virtual PluginErrorEvent *Clone() const { return new PluginErrorEvent(*this); }
protected: protected:
@ -110,7 +110,7 @@ public:
PluginInitErrorEvent( BaseException* ex=NULL ) : _parent( ex ) {} PluginInitErrorEvent( BaseException* ex=NULL ) : _parent( ex ) {}
PluginInitErrorEvent( const BaseException& ex ) : _parent( ex ) {} PluginInitErrorEvent( const BaseException& ex ) : _parent( ex ) {}
virtual ~PluginInitErrorEvent() throw() { } virtual ~PluginInitErrorEvent() = default;
virtual PluginInitErrorEvent *Clone() const { return new PluginInitErrorEvent(*this); } virtual PluginInitErrorEvent *Clone() const { return new PluginInitErrorEvent(*this); }
protected: protected:
@ -163,7 +163,7 @@ public:
BIOSLoadErrorEvent(BaseException* ex = NULL) : _parent(ex) {} BIOSLoadErrorEvent(BaseException* ex = NULL) : _parent(ex) {}
BIOSLoadErrorEvent(const BaseException& ex) : _parent(ex) {} BIOSLoadErrorEvent(const BaseException& ex) : _parent(ex) {}
virtual ~BIOSLoadErrorEvent() throw() { } virtual ~BIOSLoadErrorEvent() = default;
virtual BIOSLoadErrorEvent *Clone() const { return new BIOSLoadErrorEvent(*this); } virtual BIOSLoadErrorEvent *Clone() const { return new BIOSLoadErrorEvent(*this); }
protected: protected:
@ -233,7 +233,7 @@ protected:
FnPtr_Pcsx2App m_Method; FnPtr_Pcsx2App m_Method;
public: public:
virtual ~Pcsx2AppMethodEvent() throw() { } virtual ~Pcsx2AppMethodEvent() = default;
virtual Pcsx2AppMethodEvent *Clone() const { return new Pcsx2AppMethodEvent(*this); } virtual Pcsx2AppMethodEvent *Clone() const { return new Pcsx2AppMethodEvent(*this); }
explicit Pcsx2AppMethodEvent( FnPtr_Pcsx2App method=NULL, SynchronousActionState* sema=NULL ) explicit Pcsx2AppMethodEvent( FnPtr_Pcsx2App method=NULL, SynchronousActionState* sema=NULL )
@ -1048,7 +1048,7 @@ protected:
wxString m_elf_override; wxString m_elf_override;
public: public:
virtual ~SysExecEvent_Execute() throw() {} virtual ~SysExecEvent_Execute() = default;
SysExecEvent_Execute* Clone() const { return new SysExecEvent_Execute(*this); } SysExecEvent_Execute* Clone() const { return new SysExecEvent_Execute(*this); }
wxString GetEventName() const wxString GetEventName() const

View File

@ -71,7 +71,7 @@ pxAppResources::pxAppResources()
{ {
} }
pxAppResources::~pxAppResources() throw() {} pxAppResources::~pxAppResources() throw() = default;
wxMenu& Pcsx2App::GetRecentIsoMenu() wxMenu& Pcsx2App::GetRecentIsoMenu()
{ {

View File

@ -33,7 +33,7 @@ wxDEFINE_EVENT(pxEvt_SetTitleText, wxCommandEvent);
wxDEFINE_EVENT(pxEvt_FlushQueue, wxCommandEvent); wxDEFINE_EVENT(pxEvt_FlushQueue, wxCommandEvent);
// C++ requires abstract destructors to exist, even though they're abstract. // C++ requires abstract destructors to exist, even though they're abstract.
PipeRedirectionBase::~PipeRedirectionBase() throw() {} PipeRedirectionBase::~PipeRedirectionBase() throw() = default;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// //
@ -149,10 +149,6 @@ ConsoleLogFrame::ColorArray::ColorArray( int fontsize )
SetFont( fontsize ); SetFont( fontsize );
} }
ConsoleLogFrame::ColorArray::~ColorArray() throw()
{
}
void ConsoleLogFrame::ColorArray::SetFont( int fontsize ) void ConsoleLogFrame::ColorArray::SetFont( int fontsize )
{ {
const wxFont fixed( pxGetFixedFont( fontsize ) ); const wxFont fixed( pxGetFixedFont( fontsize ) );
@ -274,7 +270,7 @@ public:
WindowPtr = pxTheApp.m_ptr_ProgramLog; WindowPtr = pxTheApp.m_ptr_ProgramLog;
} }
virtual ~ScopedLogLock() throw() {} virtual ~ScopedLogLock() = default;
bool HasWindow() const bool HasWindow() const
{ {

View File

@ -104,7 +104,7 @@ protected:
std::array<wxTextAttr, ConsoleColors_Count> m_table; std::array<wxTextAttr, ConsoleColors_Count> m_table;
public: public:
virtual ~ColorArray() throw(); virtual ~ColorArray() = default;
ColorArray( int fontsize=8 ); ColorArray( int fontsize=8 );
void SetFont( const wxFont& font ); void SetFont( const wxFont& font );

View File

@ -28,6 +28,4 @@ CpuUsageProvider::CpuUsageProvider() :
{ {
} }
CpuUsageProvider::~CpuUsageProvider() throw() CpuUsageProvider::~CpuUsageProvider() throw() = default;
{
}

View File

@ -187,10 +187,6 @@ void Dialogs::BaseConfigurationDialog::AddOkCancel( wxSizer* sizer )
*m_extraButtonSizer += screenshotButton|pxMiddle; *m_extraButtonSizer += screenshotButton|pxMiddle;
} }
Dialogs::BaseConfigurationDialog::~BaseConfigurationDialog() throw()
{
}
void Dialogs::BaseConfigurationDialog::OnSetSettingsPage( wxCommandEvent& evt ) void Dialogs::BaseConfigurationDialog::OnSetSettingsPage( wxCommandEvent& evt )
{ {
if( !m_listbook ) return; if( !m_listbook ) return;

View File

@ -46,7 +46,7 @@ namespace Dialogs
bool m_allowApplyActivation; bool m_allowApplyActivation;
public: public:
virtual ~BaseConfigurationDialog() throw(); virtual ~BaseConfigurationDialog() = default;
BaseConfigurationDialog(wxWindow* parent, const wxString& title, int idealWidth); BaseConfigurationDialog(wxWindow* parent, const wxString& title, int idealWidth);
public: public:

View File

@ -60,7 +60,7 @@ namespace Panels
{ {
public: public:
FirstTimeIntroPanel( wxWindow* parent ); FirstTimeIntroPanel( wxWindow* parent );
virtual ~FirstTimeIntroPanel() throw() {} virtual ~FirstTimeIntroPanel() = default;
}; };
} }
@ -163,11 +163,6 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent )
Bind(wxEVT_BUTTON, &FirstTimeWizard::OnRestartWizard, this, pxID_RestartWizard); Bind(wxEVT_BUTTON, &FirstTimeWizard::OnRestartWizard, this, pxID_RestartWizard);
} }
FirstTimeWizard::~FirstTimeWizard() throw()
{
}
void FirstTimeWizard::OnRestartWizard( wxCommandEvent& evt ) void FirstTimeWizard::OnRestartWizard( wxCommandEvent& evt )
{ {
EndModal( pxID_RestartWizard ); EndModal( pxID_RestartWizard );

View File

@ -36,7 +36,7 @@ protected:
public: public:
FirstTimeWizard( wxWindow* parent ); FirstTimeWizard( wxWindow* parent );
virtual ~FirstTimeWizard() throw(); virtual ~FirstTimeWizard() = default;
wxWizardPage *GetFirstPage() const { return &m_page_intro; } wxWizardPage *GetFirstPage() const { return &m_page_intro; }

View File

@ -468,10 +468,6 @@ GSFrame::GSFrame( const wxString& title)
Bind(wxEVT_TIMER, &GSFrame::OnUpdateTitle, this, m_timer_UpdateTitle.GetId()); Bind(wxEVT_TIMER, &GSFrame::OnUpdateTitle, this, m_timer_UpdateTitle.GetId());
} }
GSFrame::~GSFrame() throw()
{
}
void GSFrame::OnCloseWindow(wxCloseEvent& evt) void GSFrame::OnCloseWindow(wxCloseEvent& evt)
{ {
sApp.OnGsFrameClosed( GetId() ); sApp.OnGsFrameClosed( GetId() );

View File

@ -97,7 +97,7 @@ protected:
public: public:
GSFrame( const wxString& title); GSFrame( const wxString& title);
virtual ~GSFrame() throw(); virtual ~GSFrame() = default;
GSPanel* GetViewport(); GSPanel* GetViewport();
void SetFocus(); void SetFocus();

View File

@ -625,10 +625,6 @@ static const GlobalCommandDescriptor CommandDeclarations[] =
{ NULL } { NULL }
}; };
CommandDictionary::~CommandDictionary() throw() {}
AcceleratorDictionary::~AcceleratorDictionary() throw() {}
void AcceleratorDictionary::Map( const KeyAcceleratorCode& _acode, const char *searchfor ) void AcceleratorDictionary::Map( const KeyAcceleratorCode& _acode, const char *searchfor )
{ {
// Search override mapping at ini file // Search override mapping at ini file

View File

@ -44,7 +44,7 @@ public:
m_ownerid = window->GetId(); m_ownerid = window->GetId();
} }
virtual ~DroppedTooManyFiles() throw() { } virtual ~DroppedTooManyFiles() = default;
virtual DroppedTooManyFiles *Clone() const { return new DroppedTooManyFiles(*this); } virtual DroppedTooManyFiles *Clone() const { return new DroppedTooManyFiles(*this); }
protected: protected:
@ -73,7 +73,7 @@ public:
m_ownerid = window->GetId(); m_ownerid = window->GetId();
} }
virtual ~DroppedElf() throw() { } virtual ~DroppedElf() = default;
virtual DroppedElf *Clone() const { return new DroppedElf(*this); } virtual DroppedElf *Clone() const { return new DroppedElf(*this); }
protected: protected:
@ -122,7 +122,7 @@ public:
m_ownerid = window->GetId(); m_ownerid = window->GetId();
} }
virtual ~DroppedIso() throw() { } virtual ~DroppedIso() = default;
virtual DroppedIso *Clone() const { return new DroppedIso(*this); } virtual DroppedIso *Clone() const { return new DroppedIso(*this); }
protected: protected:

View File

@ -734,10 +734,6 @@ void MainEmuFrame::AppendKeycodeNamesToMenuOptions() {
// "Extensible" Plugin Menus // "Extensible" Plugin Menus
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
PerPluginMenuInfo::~PerPluginMenuInfo() throw()
{
}
void PerPluginMenuInfo::Populate( PluginsEnum_t pid ) void PerPluginMenuInfo::Populate( PluginsEnum_t pid )
{ {
if( !pxAssert(pid < PluginId_Count) ) return; if( !pxAssert(pid < PluginId_Count) ) return;

View File

@ -54,7 +54,7 @@ public:
public: public:
PerPluginMenuInfo() : MyMenu(*new wxMenu()), PluginId (PluginId_Count) {} PerPluginMenuInfo() : MyMenu(*new wxMenu()), PluginId (PluginId_Count) {}
virtual ~PerPluginMenuInfo() throw(); virtual ~PerPluginMenuInfo() = default;
void Populate( PluginsEnum_t pid ); void Populate( PluginsEnum_t pid );
void OnUnloaded(); void OnUnloaded();

View File

@ -518,7 +518,7 @@ void MainEmuFrame::Menu_Exit_Click(wxCommandEvent &event)
class SysExecEvent_ToggleSuspend : public SysExecEvent class SysExecEvent_ToggleSuspend : public SysExecEvent
{ {
public: public:
virtual ~SysExecEvent_ToggleSuspend() throw() {} virtual ~SysExecEvent_ToggleSuspend() = default;
wxString GetEventName() const { return L"ToggleSuspendResume"; } wxString GetEventName() const { return L"ToggleSuspendResume"; }

View File

@ -63,7 +63,7 @@ protected:
public: public:
FileMemoryCard(); FileMemoryCard();
virtual ~FileMemoryCard() throw() {} virtual ~FileMemoryCard() = default;
void Lock(); void Lock();
void Unlock(); void Unlock();

View File

@ -48,10 +48,6 @@ Panels::BaseSelectorPanel::BaseSelectorPanel( wxWindow* parent )
Bind(wxEVT_SHOW, &BaseSelectorPanel::OnShow, this); Bind(wxEVT_SHOW, &BaseSelectorPanel::OnShow, this);
} }
Panels::BaseSelectorPanel::~BaseSelectorPanel() throw()
{
}
void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt) void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt)
{ {
evt.Skip(); evt.Skip();
@ -122,10 +118,6 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow* parent )
Bind(wxEVT_BUTTON, &BiosSelectorPanel::OnRefreshSelections, this, refreshButton->GetId()); Bind(wxEVT_BUTTON, &BiosSelectorPanel::OnRefreshSelections, this, refreshButton->GetId());
} }
Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()
{
}
void Panels::BiosSelectorPanel::Apply() void Panels::BiosSelectorPanel::Apply()
{ {
// User never visited this tab, so there's nothing to apply. // User never visited this tab, so there's nothing to apply.

View File

@ -447,7 +447,7 @@ namespace Panels
typedef BaseApplicableConfigPanel _parent; typedef BaseApplicableConfigPanel _parent;
public: public:
virtual ~BaseSelectorPanel() throw(); virtual ~BaseSelectorPanel() = default;
BaseSelectorPanel( wxWindow* parent ); BaseSelectorPanel( wxWindow* parent );
virtual void RefreshSelections(); virtual void RefreshSelections();
@ -512,7 +512,7 @@ namespace Panels
public: public:
BiosSelectorPanel( wxWindow* parent ); BiosSelectorPanel( wxWindow* parent );
virtual ~BiosSelectorPanel() throw(); virtual ~BiosSelectorPanel() = default;
protected: protected:
virtual void Apply(); virtual void Apply();

View File

@ -55,7 +55,7 @@ protected:
wxArrayString m_GamesInView; wxArrayString m_GamesInView;
public: public:
virtual ~GameDatabaseListView() throw() { } virtual ~GameDatabaseListView() = default;
GameDatabaseListView( wxWindow* parent ); GameDatabaseListView( wxWindow* parent );
void CreateColumns(); void CreateColumns();
@ -141,7 +141,7 @@ public:
m_descending = descend; m_descending = descend;
} }
virtual ~BaseGameListSort() throw() {} virtual ~BaseGameListSort() = default;
// Note: Return TRUE if the first value is less than the second value. // Note: Return TRUE if the first value is less than the second value.
bool operator()(const wxString& i1, const wxString& i2) bool operator()(const wxString& i1, const wxString& i2)

View File

@ -159,7 +159,7 @@ protected:
public: public:
ApplyPluginsDialog( BaseApplicableConfigPanel* panel=NULL ); ApplyPluginsDialog( BaseApplicableConfigPanel* panel=NULL );
virtual ~ApplyPluginsDialog() throw() {} virtual ~ApplyPluginsDialog() = default;
BaseApplicableConfigPanel* GetApplicableConfigPanel() const { return m_panel; } BaseApplicableConfigPanel* GetApplicableConfigPanel() const { return m_panel; }
}; };
@ -182,7 +182,7 @@ public:
m_owner = owner; m_owner = owner;
} }
virtual ~ApplyOverValidStateEvent() throw() { } virtual ~ApplyOverValidStateEvent() = default;
virtual ApplyOverValidStateEvent *Clone() const { return new ApplyOverValidStateEvent(*this); } virtual ApplyOverValidStateEvent *Clone() const { return new ApplyOverValidStateEvent(*this); }
protected: protected:
@ -203,7 +203,7 @@ protected:
public: public:
wxString GetEventName() const { return L"PluginSelectorPanel::ApplyPlugins"; } wxString GetEventName() const { return L"PluginSelectorPanel::ApplyPlugins"; }
virtual ~SysExecEvent_ApplyPlugins() throw() {} virtual ~SysExecEvent_ApplyPlugins() = default;
SysExecEvent_ApplyPlugins* Clone() const { return new SysExecEvent_ApplyPlugins( *this ); } SysExecEvent_ApplyPlugins* Clone() const { return new SysExecEvent_ApplyPlugins( *this ); }
SysExecEvent_ApplyPlugins( ApplyPluginsDialog* parent, SynchronousActionState& sync ) SysExecEvent_ApplyPlugins( ApplyPluginsDialog* parent, SynchronousActionState& sync )

View File

@ -48,7 +48,7 @@ class SysExecEvent_ClearSavingLoadingFlag : public SysExecEvent
public: public:
wxString GetEventName() const { return L"ClearSavingLoadingFlag"; } wxString GetEventName() const { return L"ClearSavingLoadingFlag"; }
virtual ~SysExecEvent_ClearSavingLoadingFlag() throw() { } virtual ~SysExecEvent_ClearSavingLoadingFlag() = default;
SysExecEvent_ClearSavingLoadingFlag() SysExecEvent_ClearSavingLoadingFlag()
{ {
} }

View File

@ -45,10 +45,10 @@ static const wxChar* EntryFilename_InternalStructures = L"PCSX2 Internal Structu
class BaseSavestateEntry class BaseSavestateEntry
{ {
protected: protected:
BaseSavestateEntry() {} BaseSavestateEntry() = default;
public: public:
virtual ~BaseSavestateEntry() throw() {} virtual ~BaseSavestateEntry() = default;
virtual wxString GetFilename() const=0; virtual wxString GetFilename() const=0;
virtual void FreezeIn( pxInputStream& reader ) const=0; virtual void FreezeIn( pxInputStream& reader ) const=0;
@ -60,7 +60,7 @@ class MemorySavestateEntry : public BaseSavestateEntry
{ {
protected: protected:
MemorySavestateEntry() {} MemorySavestateEntry() {}
virtual ~MemorySavestateEntry() throw() {} virtual ~MemorySavestateEntry() = default;
public: public:
virtual void FreezeIn( pxInputStream& reader ) const; virtual void FreezeIn( pxInputStream& reader ) const;
@ -83,7 +83,7 @@ public:
m_pid = pid; m_pid = pid;
} }
virtual ~PluginSavestateEntry() throw() {} virtual ~PluginSavestateEntry() = default;
virtual wxString GetFilename() const; virtual wxString GetFilename() const;
virtual void FreezeIn( pxInputStream& reader ) const; virtual void FreezeIn( pxInputStream& reader ) const;
@ -147,7 +147,7 @@ void PluginSavestateEntry::FreezeOut( SaveStateBase& writer ) const
class SavestateEntry_EmotionMemory : public MemorySavestateEntry class SavestateEntry_EmotionMemory : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_EmotionMemory() throw() {} virtual ~SavestateEntry_EmotionMemory() = default;
wxString GetFilename() const { return L"eeMemory.bin"; } wxString GetFilename() const { return L"eeMemory.bin"; }
u8* GetDataPtr() const { return eeMem->Main; } u8* GetDataPtr() const { return eeMem->Main; }
@ -163,7 +163,7 @@ public:
class SavestateEntry_IopMemory : public MemorySavestateEntry class SavestateEntry_IopMemory : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_IopMemory() throw() {} virtual ~SavestateEntry_IopMemory() = default;
wxString GetFilename() const { return L"iopMemory.bin"; } wxString GetFilename() const { return L"iopMemory.bin"; }
u8* GetDataPtr() const { return iopMem->Main; } u8* GetDataPtr() const { return iopMem->Main; }
@ -173,7 +173,7 @@ public:
class SavestateEntry_HwRegs : public MemorySavestateEntry class SavestateEntry_HwRegs : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_HwRegs() throw() {} virtual ~SavestateEntry_HwRegs() = default;
wxString GetFilename() const { return L"eeHwRegs.bin"; } wxString GetFilename() const { return L"eeHwRegs.bin"; }
u8* GetDataPtr() const { return eeHw; } u8* GetDataPtr() const { return eeHw; }
@ -183,7 +183,7 @@ public:
class SavestateEntry_IopHwRegs : public MemorySavestateEntry class SavestateEntry_IopHwRegs : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_IopHwRegs() throw() {} virtual ~SavestateEntry_IopHwRegs() = default;
wxString GetFilename() const { return L"iopHwRegs.bin"; } wxString GetFilename() const { return L"iopHwRegs.bin"; }
u8* GetDataPtr() const { return iopHw; } u8* GetDataPtr() const { return iopHw; }
@ -193,7 +193,7 @@ public:
class SavestateEntry_Scratchpad : public MemorySavestateEntry class SavestateEntry_Scratchpad : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_Scratchpad() throw() {} virtual ~SavestateEntry_Scratchpad() = default;
wxString GetFilename() const { return L"Scratchpad.bin"; } wxString GetFilename() const { return L"Scratchpad.bin"; }
u8* GetDataPtr() const { return eeMem->Scratch; } u8* GetDataPtr() const { return eeMem->Scratch; }
@ -203,7 +203,7 @@ public:
class SavestateEntry_VU0mem : public MemorySavestateEntry class SavestateEntry_VU0mem : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_VU0mem() throw() {} virtual ~SavestateEntry_VU0mem() = default;
wxString GetFilename() const { return L"vu0Memory.bin"; } wxString GetFilename() const { return L"vu0Memory.bin"; }
u8* GetDataPtr() const { return vuRegs[0].Mem; } u8* GetDataPtr() const { return vuRegs[0].Mem; }
@ -213,7 +213,7 @@ public:
class SavestateEntry_VU1mem : public MemorySavestateEntry class SavestateEntry_VU1mem : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_VU1mem() throw() {} virtual ~SavestateEntry_VU1mem() = default;
wxString GetFilename() const { return L"vu1Memory.bin"; } wxString GetFilename() const { return L"vu1Memory.bin"; }
u8* GetDataPtr() const { return vuRegs[1].Mem; } u8* GetDataPtr() const { return vuRegs[1].Mem; }
@ -223,7 +223,7 @@ public:
class SavestateEntry_VU0prog : public MemorySavestateEntry class SavestateEntry_VU0prog : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_VU0prog() throw() {} virtual ~SavestateEntry_VU0prog() = default;
wxString GetFilename() const { return L"vu0MicroMem.bin"; } wxString GetFilename() const { return L"vu0MicroMem.bin"; }
u8* GetDataPtr() const { return vuRegs[0].Micro; } u8* GetDataPtr() const { return vuRegs[0].Micro; }
@ -233,7 +233,7 @@ public:
class SavestateEntry_VU1prog : public MemorySavestateEntry class SavestateEntry_VU1prog : public MemorySavestateEntry
{ {
public: public:
virtual ~SavestateEntry_VU1prog() throw() {} virtual ~SavestateEntry_VU1prog() = default;
wxString GetFilename() const { return L"vu1MicroMem.bin"; } wxString GetFilename() const { return L"vu1MicroMem.bin"; }
u8* GetDataPtr() const { return vuRegs[1].Micro; } u8* GetDataPtr() const { return vuRegs[1].Micro; }
@ -313,7 +313,7 @@ protected:
public: public:
wxString GetEventName() const { return L"VM_Download"; } wxString GetEventName() const { return L"VM_Download"; }
virtual ~SysExecEvent_DownloadState() throw() {} virtual ~SysExecEvent_DownloadState() = default;
SysExecEvent_DownloadState* Clone() const { return new SysExecEvent_DownloadState( *this ); } SysExecEvent_DownloadState* Clone() const { return new SysExecEvent_DownloadState( *this ); }
SysExecEvent_DownloadState( ArchiveEntryList* dest_list=NULL ) SysExecEvent_DownloadState( ArchiveEntryList* dest_list=NULL )
{ {
@ -375,9 +375,7 @@ public:
m_lock_Compress.Assign(mtx_CompressToDisk); m_lock_Compress.Assign(mtx_CompressToDisk);
} }
virtual ~VmStateCompressThread() throw() virtual ~VmStateCompressThread() = default;
{
}
protected: protected:
void OnStartInThread() void OnStartInThread()
@ -405,9 +403,7 @@ protected:
public: public:
wxString GetEventName() const { return L"VM_ZipToDisk"; } wxString GetEventName() const { return L"VM_ZipToDisk"; }
virtual ~SysExecEvent_ZipToDisk() throw() virtual ~SysExecEvent_ZipToDisk() = default;
{
}
SysExecEvent_ZipToDisk* Clone() const { return new SysExecEvent_ZipToDisk( *this ); } SysExecEvent_ZipToDisk* Clone() const { return new SysExecEvent_ZipToDisk( *this ); }
@ -498,7 +494,7 @@ protected:
public: public:
wxString GetEventName() const { return L"VM_UnzipFromDisk"; } wxString GetEventName() const { return L"VM_UnzipFromDisk"; }
virtual ~SysExecEvent_UnzipFromDisk() throw() {} virtual ~SysExecEvent_UnzipFromDisk() = default;
SysExecEvent_UnzipFromDisk* Clone() const { return new SysExecEvent_UnzipFromDisk( *this ); } SysExecEvent_UnzipFromDisk* Clone() const { return new SysExecEvent_UnzipFromDisk( *this ); }
SysExecEvent_UnzipFromDisk( const wxString& filename ) SysExecEvent_UnzipFromDisk( const wxString& filename )
: m_filename( filename ) : m_filename( filename )