diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialbus/qmodbusdevice.cpp | 8 | ||||
| -rw-r--r-- | src/serialbus/qmodbusdevice.h | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusdevice_p.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/serialbus/qmodbusdevice.cpp b/src/serialbus/qmodbusdevice.cpp index 1daabcd..fbfdbcd 100644 --- a/src/serialbus/qmodbusdevice.cpp +++ b/src/serialbus/qmodbusdevice.cpp @@ -98,8 +98,8 @@ QModbusDevice::~QModbusDevice() User options: - \value UserParameter The first parameter that can be used for user-specific - purposes. \c QVariant + \value UserParameter This enum value has been deprecated. There + will be no replacement. */ /*! @@ -143,7 +143,7 @@ QVariant QModbusDevice::connectionParameter(int parameter) const default: break; } - return d->m_userConnectionParams.value(parameter); + return d->m_userConnectionParams.value(parameter); // ### Qt6: remove } /*! @@ -182,7 +182,7 @@ void QModbusDevice::setConnectionParameter(int parameter, const QVariant &value) d->m_networkAddress = value.toString(); break; default: - d->m_userConnectionParams.insert(parameter, value); + d->m_userConnectionParams.insert(parameter, value); // ### Qt6: remove break; } } diff --git a/src/serialbus/qmodbusdevice.h b/src/serialbus/qmodbusdevice.h index d25e6d3..0e6dad7 100644 --- a/src/serialbus/qmodbusdevice.h +++ b/src/serialbus/qmodbusdevice.h @@ -82,7 +82,7 @@ public: NetworkAddressParameter, // Reserved - UserParameter = 0x100 + UserParameter = 0x100 // ### Qt6: remove }; Q_ENUM(ConnectionParameter) diff --git a/src/serialbus/qmodbusdevice_p.h b/src/serialbus/qmodbusdevice_p.h index 9957b32..1526397 100644 --- a/src/serialbus/qmodbusdevice_p.h +++ b/src/serialbus/qmodbusdevice_p.h @@ -78,7 +78,7 @@ public: int m_networkPort = 502; QString m_networkAddress = QStringLiteral("127.0.0.1"); - QHash<int, QVariant> m_userConnectionParams; + QHash<int, QVariant> m_userConnectionParams; // ### Qt6: remove virtual QIODevice *device() const { return nullptr; } }; |