Merge pull request dolphin-emu#8081 from jordan-woyak/structured-binding

DolphinQt: Use a structured binding.
Ben754 · May 8, 2019 · 6607d95 · 6607d95
2 parents a2e4b72 + 6ebd35d
commit 6607d95
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -68,10 +68,7 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
   // Avoid that the button press itself is registered as an event
   Common::SleepCurrentThread(50);
 
-  std::shared_ptr<ciface::Core::Device> device;
-  ciface::Core::Device::Input* input;
-
-  std::tie(device, input) = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
+  const auto [device, input] = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
 
   const auto timer = new QTimer(button);