From 27e1577da90c04b642f86d23c5884cebf22df1a0 Mon Sep 17 00:00:00 2001 From: Michael M Date: Fri, 3 Nov 2017 14:31:17 -0700 Subject: Qt MappingWindow: move controller type into constructor --- Source/Core/DolphinQt2/Config/ControllersWindow.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/ControllersWindow.cpp') diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index ed8e08a91f..be22be811c 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -78,12 +78,6 @@ ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent) CreateMainLayout(); LoadSettings(); ConnectWidgets(); - - for (size_t i = 0; i < m_gc_mappings.size(); i++) - m_gc_mappings[i] = new MappingWindow(this, static_cast(i)); - - for (size_t i = 0; i < m_wiimote_mappings.size(); i++) - m_wiimote_mappings[i] = new MappingWindow(this, static_cast(i)); } void ControllersWindow::CreateGamecubeLayout() @@ -440,8 +434,8 @@ void ControllersWindow::OnGCPadConfigure() default: return; } - m_gc_mappings[index]->ChangeMappingType(type); - m_gc_mappings[index]->exec(); + + MappingWindow(this, type, static_cast(index)).exec(); } void ControllersWindow::OnWiimoteConfigure() @@ -468,8 +462,8 @@ void ControllersWindow::OnWiimoteConfigure() default: return; } - m_wiimote_mappings[index]->ChangeMappingType(type); - m_wiimote_mappings[index]->exec(); + + MappingWindow(this, type, static_cast(index)).exec(); } void ControllersWindow::UnimplementedButton() -- cgit v1.2.3