summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
diff options
context:
space:
mode:
authorMichael M <mchtly@gmail.com>2017-11-03 14:31:17 -0700
committerMichael M <mchtly@gmail.com>2017-11-05 08:04:16 -0800
commit27e1577da90c04b642f86d23c5884cebf22df1a0 (patch)
tree3fb1efcd059051f34b0ea21a750750a19b399f43 /Source/Core/DolphinQt2/Config/ControllersWindow.cpp
parentbb38b399528e3932acf1e796e26ba2eb723d1f8c (diff)
Qt MappingWindow: move controller type into constructor
Diffstat (limited to 'Source/Core/DolphinQt2/Config/ControllersWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/ControllersWindow.cpp14
1 files changed, 4 insertions, 10 deletions
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<int>(i));
-
- for (size_t i = 0; i < m_wiimote_mappings.size(); i++)
- m_wiimote_mappings[i] = new MappingWindow(this, static_cast<int>(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<int>(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<int>(index)).exec();
}
void ControllersWindow::UnimplementedButton()