Merge pull request #8031 from spycrab/qt_remove_iterative_input

Qt/Mapping: Remove iterative input

5 files changed, 0 insertions, 42 deletions

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index 5c66f9ec94..3d43e02e96 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -104,9 +104,6 @@ void MappingButton::Detect()
 
   ConfigChanged();
   m_parent->SaveSettings();
-
-  if (m_parent->IsIterativeInput())
-    m_parent->NextButton(this);
 }
 
 void MappingButton::Clear()
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
index 257b9008c5..dd1d833947 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
@@ -46,29 +46,6 @@ MappingWindow* MappingWidget::GetParent() const
   return m_parent;
 }
 
-bool MappingWidget::IsIterativeInput() const
-{
-  return m_parent->IsIterativeInput();
-}
-
-void MappingWidget::NextButton(MappingButton* button)
-{
-  auto iterator = std::find(m_buttons.begin(), m_buttons.end(), button);
-
-  if (iterator == m_buttons.end())
-    return;
-
-  if (++iterator == m_buttons.end())
-    return;
-
-  MappingButton* next = *iterator;
-
-  if (next->IsInput() && next->isVisible())
-    next->Detect();
-  else
-    NextButton(next);
-}
-
 int MappingWidget::GetPort() const
 {
   return m_parent->GetPort();
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
index 84a2cf4e64..d611aa9749 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
@@ -45,9 +45,6 @@ public:
 
   MappingWindow* GetParent() const;
 
-  bool IsIterativeInput() const;
-  void NextButton(MappingButton* button);
-
   virtual void LoadSettings() = 0;
   virtual void SaveSettings() = 0;
   virtual InputConfig* GetConfig() = 0;
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
index eb049b65f6..adaedf2da0 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -120,19 +120,14 @@ void MappingWindow::CreateMainLayout()
 {
   m_main_layout = new QVBoxLayout();
   m_config_layout = new QHBoxLayout();
-  m_iterative_input = new QCheckBox(tr("Iterative Input"));
   m_tab_widget = new QTabWidget();
   m_button_box = new QDialogButtonBox(QDialogButtonBox::Close);
 
-  m_iterative_input->setToolTip(tr("Automatically progress one button after another during "
-                                   "configuration. Useful for first-time setup."));
-
   m_config_layout->addWidget(m_devices_box);
   m_config_layout->addWidget(m_reset_box);
   m_config_layout->addWidget(m_profiles_box);
 
   m_main_layout->addLayout(m_config_layout);
-  m_main_layout->addWidget(m_iterative_input);
   m_main_layout->addWidget(m_tab_widget);
   m_main_layout->addWidget(m_button_box);
 
@@ -417,8 +412,3 @@ void MappingWindow::OnClearFieldsPressed()
   emit ConfigChanged();
   emit Save();
 }
-
-bool MappingWindow::IsIterativeInput() const
-{
-  return m_iterative_input->isChecked();
-}
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
index ed6fe0fcb2..e19abc065d 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
@@ -16,7 +16,6 @@ class EmulatedController;
 }
 
 class InputConfig;
-class QCheckBox;
 class QComboBox;
 class QDialogButtonBox;
 class QEvent;
@@ -50,7 +49,6 @@ public:
 
   int GetPort() const;
   ControllerEmu::EmulatedController* GetController() const;
-  bool IsIterativeInput() const;
   bool IsMappingAllDevices() const;
 
 signals:
@@ -83,7 +81,6 @@ private:
   ControllerEmu::EmulatedController* m_controller = nullptr;
 
   // Main
-  QCheckBox* m_iterative_input;
   QVBoxLayout* m_main_layout;
   QHBoxLayout* m_config_layout;
   QDialogButtonBox* m_button_box;