t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SocketCan: Fix warnings about old style casts and sign changes

Browse Source
This commit is contained in:
Andre Hartmann
2017-09-02 10:08:01 +02:00
parent 1c638896e4
commit c835f36fe9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/socketcan.cpp
+3 -2
View File
@@ -116,7 +116,8 @@ bool SocketCan::piSendFrame(const CANFrame& pFrame)
QCanBusFrame frame; QCanBusFrame frame;
frame.setFrameId(pFrame.ID); frame.setFrameId(pFrame.ID);
frame.setExtendedFrameFormat(false); frame.setExtendedFrameFormat(false);
frame.setPayload(QByteArray((const char*)pFrame.data, pFrame.len)); frame.setPayload(QByteArray(reinterpret_cast<const char *>(pFrame.data),
static_cast<int>(pFrame.len)));
return mDev_p->writeFrame(frame); return mDev_p->writeFrame(frame);
} }
@@ -184,7 +185,7 @@ void SocketCan::framesReceived()
{ {
CANFrame* frame_p = getQueue().get(); CANFrame* frame_p = getQueue().get();
if(frame_p) { if(frame_p) {
frame_p->len = recFrame.payload().length(); frame_p->len = static_cast<uint32_t>(recFrame.payload().length());
frame_p->bus = 0; frame_p->bus = 0;
memcpy(frame_p->data, recFrame.payload().data(), frame_p->len); memcpy(frame_p->data, recFrame.payload().data(), frame_p->len);
frame_p->extended = false; frame_p->extended = false;