diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2021-01-06 19:00:57 +0100 |
|---|---|---|
| committer | Andre Hartmann <aha_1980@gmx.de> | 2021-02-03 14:57:12 +0100 |
| commit | 227060f8c17aaf90fe542ad6079a6badaf410a0d (patch) | |
| tree | 4c6e441c846a199a4e436f0a4fea07eeca9fa292 /src/plugins/canbus/socketcan/socketcanbackend.cpp | |
| parent | c990bdbf8ec922dd7702a2a0e33b9b70db3ac6ee (diff) | |
QCanBusDevice: Replace int parameter with ConfigurationKey
They only place where this might break user code,
is for custom plugins using custom configuration
parameters.
For most users however, this type safety makes the
API easier to use.
[ChangeLog][QCanBusDevice]
All functions dealing with configuration parameters
now take a QCanBusDevice::ConfigurationKey instead
an int.
Fixes: QTBUG-89839
Change-Id: I0a1de5fdcfc4292b23599d4770102740a2df1601
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index a3259f5..c6785b6 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -224,7 +224,7 @@ void SocketCanBackend::close() setState(QCanBusDevice::UnconnectedState); } -bool SocketCanBackend::applyConfigurationParameter(int key, const QVariant &value) +bool SocketCanBackend::applyConfigurationParameter(ConfigurationKey key, const QVariant &value) { bool success = false; @@ -353,7 +353,7 @@ bool SocketCanBackend::applyConfigurationParameter(int key, const QVariant &valu break; } default: - setError(tr("SocketCanBackend: No such configuration as %1 in SocketCanBackend").arg(key), + setError(tr("Unsupported configuration key: %1").arg(key), QCanBusDevice::CanBusError::ConfigurationError); break; } @@ -401,7 +401,7 @@ bool SocketCanBackend::connectSocket() //apply all stored configurations const auto keys = configurationKeys(); - for (int key : keys) { + for (ConfigurationKey key : keys) { const QVariant param = configurationParameter(key); bool success = applyConfigurationParameter(key, param); if (Q_UNLIKELY(!success)) { @@ -413,7 +413,7 @@ bool SocketCanBackend::connectSocket() return true; } -void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value) +void SocketCanBackend::setConfigurationParameter(ConfigurationKey key, const QVariant &value) { if (key == QCanBusDevice::RawFilterKey) { //verify valid/supported filters |