summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2021-03-17 18:56:19 +0100
committerAndre Hartmann <aha_1980@gmx.de>2021-03-27 16:31:56 +0100
commit43854c9e1fb90175979b5aa1f536dce26f5dd65e (patch)
tree53d5c5e1d03be4d605c5d80ae2cee350add887ac /src/tools
parent9ca7c251d679b94af8436463b3c6c1e7e07625b4 (diff)
Introduce QCanBusFrame::FrameId
Use a dedicated type instead of quint32 to mark a CAN bus frame identifier as such. For now it is just an alias to quint32, but can be changed to some other type for Qt 7. [ChangeLog][QCanBusFrame] Introduced a specific type QCanBusFrame::FrameId for the CAN bus frames identifier. The new type is a typedef to quint32 and therefore should be source compatible. Change-Id: Ie26aa69cd48eb9cee4c11a0c8f8ba74efae24b4f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/canbusutil/canbusutil.cpp2
-rw-r--r--src/tools/canbusutil/canbusutil.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index 677e7e2..9059611 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -125,7 +125,7 @@ int CanBusUtil::printDevices(const QString &pluginName)
return 0;
}
-bool CanBusUtil::parseDataField(quint32 &id, QString &payload)
+bool CanBusUtil::parseDataField(QCanBusFrame::FrameId &id, QString &payload)
{
int hashMarkPos = m_data.indexOf('#');
if (hashMarkPos < 0) {
diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h
index 0c2ba8f..9cc311a 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(quint32 &id, QString &payload);
+ bool parseDataField(QCanBusFrame::FrameId &id, QString &payload);
bool setFrameFromPayload(QString payload, QCanBusFrame *frame);
bool connectCanDevice();
bool sendData();