ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: use = default instead of trivial copy constructor

This commit is contained in:
Gregory Hainaut 2017-05-06 13:06:08 +02:00
parent 585ccc1b24
commit 94b50b85e7
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/Utilities/pxEvents.h
View File

@ -386,7 +386,7 @@ public:
pxMessageBoxEvent() {}
pxMessageBoxEvent(const wxString &title, const wxString &content, const MsgButtons &buttons, SynchronousActionState &instdata);
pxMessageBoxEvent(const wxString &title, const wxString &content, const MsgButtons &buttons, SynchronousActionState *instdata = NULL);
pxMessageBoxEvent(const pxMessageBoxEvent &event);
pxMessageBoxEvent(const pxMessageBoxEvent &event) = default;
protected:
int _DoDialog() const;
@ -409,7 +409,7 @@ public:
pxAssertionEvent(const wxString &content = wxEmptyString, const wxString &trace = wxEmptyString, SynchronousActionState *instdata = NULL);
pxAssertionEvent(const wxString &content, const wxString &trace, SynchronousActionState &instdata);
pxAssertionEvent(const pxAssertionEvent &event);
pxAssertionEvent(const pxAssertionEvent &event) = default;
pxAssertionEvent &SetStacktrace(const wxString &trace);

13
pcsx2/gui/MessageBoxes.cpp
View File

@ -97,13 +97,6 @@ pxMessageBoxEvent::pxMessageBoxEvent( const wxString& title, const wxString& con
{
}
pxMessageBoxEvent::pxMessageBoxEvent( const pxMessageBoxEvent& event )
: BaseMessageBoxEvent( event )
, m_Title( event.m_Title )
, m_Buttons( event.m_Buttons )
{
}
int pxMessageBoxEvent::_DoDialog() const
{
return pxMessageDialog( m_Title, m_Content, m_Buttons );
@ -126,12 +119,6 @@ pxAssertionEvent::pxAssertionEvent( const wxString& content, const wxString& tra
{
}
pxAssertionEvent::pxAssertionEvent( const pxAssertionEvent& event )
: BaseMessageBoxEvent( event )
, m_Stacktrace( event.m_Stacktrace )
{
}
pxAssertionEvent& pxAssertionEvent::SetStacktrace( const wxString& trace )
{
m_Stacktrace = trace;