diff options
| author | Mat M <mathew1800@gmail.com> | 2016-11-11 13:58:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 13:58:33 -0500 |
| commit | fbfce2a043394ecbd6da7affd6184a640e858d29 (patch) | |
| tree | 22ae5fc5e84fa6e22a524149160c9cf6619ef349 /Source/Core | |
| parent | e8af48adfca6e6fb291c5c715af1562569dc1bd3 (diff) | |
| parent | cd9520f458023e7e771b2feabc4bbb3fb2cfcf0b (diff) | |
Merge pull request #4442 from lioncash/param
CodeWindow: Remove unused constructor parameter
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.h | 9 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index c39efe0047..1465437152 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -51,11 +51,9 @@ #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" -CCodeWindow::CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame* parent, wxWindowID id, - const wxPoint& position, const wxSize& size, long style, - const wxString& name) - : wxPanel(parent, id, position, size, style, name), m_sibling_panels(), Parent(parent), - codeview(nullptr) +CCodeWindow::CCodeWindow(CFrame* parent, wxWindowID id, const wxPoint& position, const wxSize& size, + long style, const wxString& name) + : wxPanel(parent, id, position, size, style, name), Parent(parent) { DebugInterface* di = &PowerPC::debug_interface; diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index b3f5bca191..423e86d6eb 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -75,9 +75,10 @@ struct DebugPanelToID<GFXDebuggerPanel> class CCodeWindow : public wxPanel { public: - CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame* parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxBORDER_NONE, const wxString& name = _("Code")); + explicit CCodeWindow(CFrame* parent, wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxBORDER_NONE, + const wxString& name = _("Code")); ~CCodeWindow(); void Load(); @@ -156,7 +157,7 @@ private: // Sibling debugger panels // FIXME: This obviously belongs in some manager class above this one. - std::array<wxPanel*, IDM_DEBUG_WINDOW_LIST_END - IDM_DEBUG_WINDOW_LIST_START> m_sibling_panels; + std::array<wxPanel*, IDM_DEBUG_WINDOW_LIST_END - IDM_DEBUG_WINDOW_LIST_START> m_sibling_panels{}; CFrame* Parent; CCodeView* codeview; diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 7e50d93026..129cd16108 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -324,7 +324,7 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo // Debugger class if (UseDebugger) { - g_pCodeWindow = new CCodeWindow(SConfig::GetInstance(), this, IDM_CODE_WINDOW); + g_pCodeWindow = new CCodeWindow(this, IDM_CODE_WINDOW); LoadIniPerspectives(); g_pCodeWindow->Load(); } |