2 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp
index e83b569..eb13cea 100644
--- a/src/plugins/canbus/socketcan/main.cpp
+++ b/src/plugins/canbus/socketcan/main.cpp
@@ -53,8 +53,9 @@ class SocketCanBusPlugin : public QObject, public QCanBusFactory
 
 
 public:
-    QCanBusDevice *createDevice(const QString &interfaceName) const
+    QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const override
     {
+        Q_UNUSED(errorMessage);
         auto device = new SocketCanBackend(interfaceName);
         return device;
     }
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 60f36f9..c9781d1 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -594,14 +594,10 @@ void SocketCanBackend::readSocket()
         if (ioctl(canSocket, SIOCGSTAMP, &timeStamp) < 0) {
             setError(qt_error_string(errno),
                      QCanBusDevice::CanBusError::ReadError);
-            timeStamp.tv_sec = 0;
-            timeStamp.tv_usec = 0;
+            memset(&timeStamp, 0, sizeof(timeStamp));
         }
 
-        QCanBusFrame::TimeStamp stamp;
-        stamp.setSeconds(timeStamp.tv_sec);
-        stamp.setMicroSeconds(timeStamp.tv_usec);
-
+        const QCanBusFrame::TimeStamp stamp(timeStamp.tv_sec, timeStamp.tv_usec);
         QCanBusFrame bufferedFrame;
         bufferedFrame.setTimeStamp(stamp);
 
@@ -615,10 +611,10 @@ void SocketCanBackend::readSocket()
 
         bufferedFrame.setFrameId(frame.can_id & CAN_EFF_MASK);
 
-        QByteArray load(reinterpret_cast<char *>(frame.data), frame.len);
+        const QByteArray load(reinterpret_cast<char *>(frame.data), frame.len);
         bufferedFrame.setPayload(load);
 
-        newFrames.append(bufferedFrame);
+        newFrames.append(std::move(bufferedFrame));
     }
 
     enqueueReceivedFrames(newFrames);