From 2188ac785af005037340eb5dd167d327266dbc8f Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 13 Jun 2017 16:57:05 -0700 Subject: [PATCH] Move MappingWindow::OnDefaultFieldsPressed() to correct file --- .../Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 10 ---------- .../Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index cd776f6cbb..b72f13aa9a 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -90,16 +90,6 @@ void MappingButton::SetBlockInputs(const bool block) m_block = block; } -void MappingWindow::OnDefaultFieldsPressed() -{ - if (m_controller == nullptr) - return; - - m_controller->LoadDefaults(g_controller_interface); - m_controller->UpdateReferences(g_controller_interface); - emit Update(); -} - bool MappingButton::event(QEvent* event) { return !m_block ? QPushButton::event(event) : true; diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 660ac02174..785ff5788e 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -381,3 +381,13 @@ bool MappingWindow::event(QEvent* event) return false; } + +void MappingWindow::OnDefaultFieldsPressed() +{ + if (m_controller == nullptr) + return; + + m_controller->LoadDefaults(g_controller_interface); + m_controller->UpdateReferences(g_controller_interface); + emit Update(); +}