Index: sources/canbus/FrameInterface.h =================================================================== diff -u -r1b24a85761c65a685fac98f396e244af97b94443 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 1b24a85761c65a685fac98f396e244af97b94443) +++ sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file FrameInterface.h - * \author (last) Behrouz NematiPour - * \date (last) 31-Aug-2020 - * \author (original) Behrouz NematiPour - * \date (original) 26-Aug-2020 + * \file FrameInterface.h + * \author (last) Behrouz NematiPour + * \date (last) 21-Jan-2023 + * \author (original) Behrouz NematiPour + * \date (original) 26-Aug-2020 * */ #pragma once @@ -19,7 +19,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MessageGlobals.h" // Define @@ -37,7 +37,7 @@ * \brief The FrameInterface class * \details This class is an interface between QByteArray and QCanBusFrame * and gets the data as QByteArray and creates a frame - * and sends it to the CanInterface to deal with the CANBUS. + * and sends it to the CanInterface to deal with the CANBus. * And does it in reverse when receives a frame from CanInterface. */ class FrameInterface : public QObject @@ -54,7 +54,7 @@ /*! * \brief The ChannelGroup enum - * \details The enum which represent the categories of the CANBUS channel + * \details The enum which represent the categories of the CANBus channel */ enum class ChannelGroup { eChannel_Unknown, ///< An Unknown channels category @@ -70,10 +70,9 @@ Can_Id can_Id; QByteArray data ; - Frame(Can_Id vCan_Id, const QByteArray &vData) { - can_Id = vCan_Id; - data = vData ; - } + Frame(Can_Id vCan_Id, const QByteArray &vData): + can_Id (vCan_Id), + data (vData ) { } }; QList _txFrameList; @@ -85,13 +84,11 @@ QString _timestamp; protected: - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) override; public slots: bool init(); bool init(QThread &vThread); - -private slots: void quit(); private: