From 94b50b85e7867b1219727ee5d53db89c4fbd589c Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 6 May 2017 13:06:08 +0200 Subject: [PATCH] core: use = default instead of trivial copy constructor --- common/include/Utilities/pxEvents.h | 4 ++-- pcsx2/gui/MessageBoxes.cpp | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/common/include/Utilities/pxEvents.h b/common/include/Utilities/pxEvents.h index c9bcb54661..8b7d16ee5a 100644 --- a/common/include/Utilities/pxEvents.h +++ b/common/include/Utilities/pxEvents.h @@ -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); diff --git a/pcsx2/gui/MessageBoxes.cpp b/pcsx2/gui/MessageBoxes.cpp index 297a5e9c03..b5c7e490bb 100644 --- a/pcsx2/gui/MessageBoxes.cpp +++ b/pcsx2/gui/MessageBoxes.cpp @@ -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;