diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/.qmake.conf b/.qmake.conf index b5e35ea..c6f1702 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.1 +MODULE_VERSION = 5.14.0 diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp index f4198e3..8d6cd39 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp @@ -223,17 +223,17 @@ Q_GLOBAL_STATIC(DefaultMapping, g_defaultMapping) void QAndroidGamepadBackend::Mapping::AndroidAxisInfo::restoreSavedData(const QVariantMap &value) { - gamepadAxis = QGamepadManager::GamepadAxis(value[QLatin1Literal("axis")].toInt()); - gamepadMinButton = QGamepadManager::GamepadButton(value[QLatin1Literal("minButton")].toInt()); - gamepadMaxButton = QGamepadManager::GamepadButton(value[QLatin1Literal("maxButton")].toInt()); + gamepadAxis = QGamepadManager::GamepadAxis(value[QLatin1String("axis")].toInt()); + gamepadMinButton = QGamepadManager::GamepadButton(value[QLatin1String("minButton")].toInt()); + gamepadMaxButton = QGamepadManager::GamepadButton(value[QLatin1String("maxButton")].toInt()); } QVariantMap QAndroidGamepadBackend::Mapping::AndroidAxisInfo::dataToSave() const { QVariantMap data; - data[QLatin1Literal("axis")] = gamepadAxis; - data[QLatin1Literal("minButton")] = gamepadMinButton; - data[QLatin1Literal("maxButton")] = gamepadMaxButton; + data[QLatin1String("axis")] = gamepadAxis; + data[QLatin1String("minButton")] = gamepadMinButton; + data[QLatin1String("maxButton")] = gamepadMaxButton; return data; } diff --git a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp index 8e86bf2..a700a41 100644 --- a/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp +++ b/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp @@ -100,18 +100,18 @@ void QEvdevGamepadDevice::EvdevAxisInfo::setAbsInfo(int fd, int abs) void QEvdevGamepadDevice::EvdevAxisInfo::restoreSavedData(int fd, int abs, const QVariantMap &value) { - gamepadAxis = QGamepadManager::GamepadAxis(value[QLatin1Literal("axis")].toInt()); - gamepadMinButton = QGamepadManager::GamepadButton(value[QLatin1Literal("minButton")].toInt()); - gamepadMaxButton = QGamepadManager::GamepadButton(value[QLatin1Literal("maxButton")].toInt()); + gamepadAxis = QGamepadManager::GamepadAxis(value[QLatin1String("axis")].toInt()); + gamepadMinButton = QGamepadManager::GamepadButton(value[QLatin1String("minButton")].toInt()); + gamepadMaxButton = QGamepadManager::GamepadButton(value[QLatin1String("maxButton")].toInt()); setAbsInfo(fd, abs); } QVariantMap QEvdevGamepadDevice::EvdevAxisInfo::dataToSave() const { QVariantMap data; - data[QLatin1Literal("axis")] = gamepadAxis; - data[QLatin1Literal("minButton")] = gamepadMinButton; - data[QLatin1Literal("maxButton")] = gamepadMaxButton; + data[QLatin1String("axis")] = gamepadAxis; + data[QLatin1String("minButton")] = gamepadMinButton; + data[QLatin1String("maxButton")] = gamepadMaxButton; return data; } @@ -332,13 +332,13 @@ bool QEvdevGamepadDevice::openDevice(const QByteArray &dev) QVariant settings = m_backend->readSettings(m_productId); if (!settings.isNull()) { m_needsConfigure = false; - QVariantMap data = settings.toMap()[QLatin1Literal("axes")].toMap(); + QVariantMap data = settings.toMap()[QLatin1String("axes")].toMap(); for (QVariantMap::const_iterator it = data.begin(); it != data.end(); ++it) { const int key = it.key().toInt(); m_axisMap[key].restoreSavedData(m_fd, key, it.value().toMap()); } - data = settings.toMap()[QLatin1Literal("buttons")].toMap(); + data = settings.toMap()[QLatin1String("buttons")].toMap(); for (QVariantMap::const_iterator it = data.begin(); it != data.end(); ++it) m_buttonsMap[it.key().toInt()] = QGamepadManager::GamepadButton(it.value().toInt()); } @@ -416,13 +416,13 @@ void QEvdevGamepadDevice::saveData() QVariantMap settings, data; for (AxisMap::const_iterator it = m_axisMap.begin(); it != m_axisMap.end(); ++it) data[QString::number(it.key())] = it.value().dataToSave(); - settings[QLatin1Literal("axes")] = data; + settings[QLatin1String("axes")] = data; data.clear(); for (ButtonsMap::const_iterator it = m_buttonsMap.begin(); it != m_buttonsMap.end(); ++it) data[QString::number(it.key())] = it.value(); - settings[QLatin1Literal("buttons")] = data; + settings[QLatin1String("buttons")] = data; m_backend->saveSettings(m_productId, settings); } |