aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-02-15 11:19:30 +0200
committerBogDan Vatra <bogdan@kdab.com>2016-02-16 10:13:08 +0000
commit3191140c9536ce0a8bdb9d35b4a8d09ec7fc28ac (patch)
tree6ed414612609d04d8e2268874fbc3051c903282f
parent1324983f5299e44e60bba733229b9872de5d8a74 (diff)
Android: resetConfiguration for good
There is no need to use any default values. Change-Id: Ib2b37f4198761ba06719585cb9bf114e15a4d082 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
index ab09cdd..492e123 100644
--- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
+++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
@@ -364,9 +364,12 @@ void QAndroidGamepadBackend::resetConfiguration(int deviceId)
if (it == m_devices.end())
return;
- int productId = it.value().productId;
- it.value() = *g_defaultMapping();
- it.value().productId = productId;
+ it.value().axisMap.clear();
+ it.value().buttonsMap.clear();
+ it.value().calibrateButton = QGamepadManager::ButtonInvalid;
+ it.value().calibrateAxis = QGamepadManager::AxisInvalid;
+ it.value().cancelConfigurationButton = QGamepadManager::ButtonInvalid;
+ it.value().needsConfigure = false;
}
bool QAndroidGamepadBackend::handleKeyEvent(jobject event)