Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r56d00a82669a7a2c00ab90109a89dbec8db27527 -r8c69137f18382bdc55a5678e6ed44a7683fe4dea --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 56d00a82669a7a2c00ab90109a89dbec8db27527) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) @@ -1,6 +1,6 @@ /*! * - * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, * IN PART OR IN WHOLE, @@ -18,7 +18,6 @@ // Project #include "messageglobals.h" -#include "types.h" namespace Can { @@ -35,8 +34,8 @@ void printUnhandled (const Message &vMessage); - bool interpretMessage_HD (const Message &vMessage , Gui::GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage_DG (const Message &vMessage , Gui::GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_HD (const Message &vMessage , QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_DG (const Message &vMessage , QVariantList &vData) __attribute_warn_unused_result__; bool getPowerOffData (const Message &vMessage , quint8 &vShowHide) __attribute_warn_unused_result__; @@ -67,8 +66,8 @@ explicit MessageInterpreter(QObject *parent = nullptr); // interpret the data into GUI understandable Actions/Data - bool interpretMessage(const Can_Id vCan_Id, const Message &vMessage, Gui::GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload) __attribute_warn_unused_result__; + bool interpretMessage(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload) __attribute_warn_unused_result__; signals: