diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-08 15:56:06 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-09 12:23:57 +0200 |
commit | 39d0041f15601cee499c959702b004cbd721bed9 (patch) | |
tree | 95140b88dee61bd78d171cb958ceca0cca978ad1 /src/input/backend/qabstractphysicaldevicebackendnode.cpp | |
parent | 93bd28e6d4ac8fdb6b07b30684e6b17ee515e44e (diff) |
Use QList instead of QVector in implementation and docs
Fix some const correctness.
Use list-initialization.
Task-number: QTBUG-84469
Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/backend/qabstractphysicaldevicebackendnode.cpp')
-rw-r--r-- | src/input/backend/qabstractphysicaldevicebackendnode.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index 18d932a21..f7447eb80 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -79,37 +79,31 @@ void QAbstractPhysicalDeviceBackendNodePrivate::addAxisSetting(int axisIdentifie axisIdSetting.m_axisSettingsId = axisSettingsId; // Replace if already present, otherwise append - bool replaced = false; - QVector<Input::AxisIdSetting>::iterator it; - QVector<Input::AxisIdSetting>::iterator end = m_axisSettings.end(); - for (it = m_axisSettings.begin(); it != end; ++it) { + const auto end = m_axisSettings.end(); + for (auto it = m_axisSettings.begin(); it != end; ++it) { if (it->m_axisIdentifier == axisIdentifier) { *it = axisIdSetting; - replaced = true; - break; + return; } } - - if (!replaced) - m_axisSettings.push_back(axisIdSetting); + m_axisSettings.push_back(axisIdSetting); } void QAbstractPhysicalDeviceBackendNodePrivate::removeAxisSetting(Qt3DCore::QNodeId axisSettingsId) { - QVector<Input::AxisIdSetting>::iterator it; - for (it = m_axisSettings.begin(); it != m_axisSettings.end(); ++it) { + const auto end = m_axisSettings.end(); + for (auto it = m_axisSettings.begin(); it != end; ++it) { if (it->m_axisSettingsId == axisSettingsId) { m_axisSettings.erase(it); - break; + return; } } } Input::MovingAverage &QAbstractPhysicalDeviceBackendNodePrivate::getOrCreateFilter(int axisIdentifier) { - QVector<Input::AxisIdFilter>::iterator it; - QVector<Input::AxisIdFilter>::iterator end = m_axisFilters.end(); - for (it = m_axisFilters.begin(); it != end; ++it) { + const auto end = m_axisFilters.end(); + for (auto it = m_axisFilters.begin(); it != end; ++it) { if (it->m_axisIdentifier == axisIdentifier) return it->m_filter; } @@ -196,9 +190,8 @@ float QAbstractPhysicalDeviceBackendNode::processedAxisValue(int axisIdentifier) // Find axis settings for this axis (if any) Qt3DCore::QNodeId axisSettingId; - QVector<Input::AxisIdSetting>::const_iterator it; - QVector<Input::AxisIdSetting>::const_iterator end = d->m_axisSettings.cend(); - for (it = d->m_axisSettings.cbegin(); it != end; ++it) { + const auto end = d->m_axisSettings.cend(); + for (auto it = d->m_axisSettings.cbegin(); it != end; ++it) { if (it->m_axisIdentifier == axisIdentifier) { axisSettingId = it->m_axisSettingsId; break; |