diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-08-20 17:15:57 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-08-30 15:23:47 +0000 |
| commit | 1b4fa1d598b31cb0cec46ebb1271f5b232e4f61b (patch) | |
| tree | d420702428347f4130a7bccef2bf38a8edbb9ba4 /src/tools | |
| parent | 3dd598e649c823b4630f0810a939a3945f1857c4 (diff) | |
Canbusutil: Fix Clang semantic warnings
Value Conversion Issue -Wsign-conversion
224:22: warning: implicit conversion changes signedness: 'qint32' (aka
'int') to 'quint32' (aka 'unsigned int')
Change-Id: I174a07c44c39e5a7549dacf959ffe53bff59ee1d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 8 | ||||
| -rw-r--r-- | src/tools/canbusutil/canbusutil.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index 0a0a6df..e319f44 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/src/tools/canbusutil/canbusutil.cpp @@ -104,7 +104,7 @@ int CanBusUtil::printDevices(const QString &pluginName) return 0; } -bool CanBusUtil::parseDataField(qint32 &id, QString &payload) +bool CanBusUtil::parseDataField(quint32 &id, QString &payload) { int hashMarkPos = m_data.indexOf('#'); if (hashMarkPos < 0) { @@ -112,7 +112,7 @@ bool CanBusUtil::parseDataField(qint32 &id, QString &payload) return false; } - id = m_data.left(hashMarkPos).toInt(nullptr, 16); + id = m_data.left(hashMarkPos).toUInt(nullptr, 16); payload = m_data.right(m_data.length() - hashMarkPos - 1); return true; @@ -206,7 +206,7 @@ bool CanBusUtil::connectCanDevice() bool CanBusUtil::sendData() { - qint32 id; + quint32 id; QString payload; QCanBusFrame frame; @@ -216,7 +216,7 @@ bool CanBusUtil::sendData() if (setFrameFromPayload(payload, &frame) == false) return false; - if (id < 0 || id > 0x1FFFFFFF) { // 29 bits + if (id > 0x1FFFFFFF) { // 29 bits id = 0x1FFFFFFF; m_output << "Warning! Id does not fit into Extended Frame Format, setting id to: " << id << endl; } diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h index e9e7d2b..356b3df 100644 --- a/src/tools/canbusutil/canbusutil.h +++ b/src/tools/canbusutil/canbusutil.h @@ -63,7 +63,7 @@ public: int printDevices(const QString &pluginName); private: - bool parseDataField(qint32 &id, QString &payload); + bool parseDataField(quint32 &id, QString &payload); bool setFrameFromPayload(QString payload, QCanBusFrame *frame); bool connectCanDevice(); bool sendData(); |