Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r227f28b202f81ab3dd04a81868697025ccab6220 -re58b907a69d4ca7daa77d69791593b886d1b80e8 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 227f28b202f81ab3dd04a81868697025ccab6220) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision e58b907a69d4ca7daa77d69791593b886d1b80e8) @@ -90,14 +90,14 @@ * \return true if the message channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ -bool MessageInterpreter::interpretMessage(const Can_Id vCan_Id, const Message &vMessage, Gui::GuiActionType &vActionId, QVariantList &vData) +bool MessageInterpreter::interpretMessage(const Message &vMessage, QVariantList &vData) { bool ok = false; - switch (vCan_Id) { + switch (vMessage.can_id) { case eChlid_HD: case eChlid_HD_Alarm: case eChlid_HD_Sync: - ok = interpretMessage_HD(vMessage, vActionId, vData); + ok = interpretMessage_HD(vMessage, vData); break; default: break; @@ -133,13 +133,12 @@ * \return true if the message CANBUS channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ -bool MessageInterpreter::interpretMessage_HD(const Message &vMessage, Gui::GuiActionType &vActionId, QVariantList &vData) +bool MessageInterpreter::interpretMessage_HD(const Message &vMessage, QVariantList &vData) { bool ok = true; - vActionId = vMessage.actionId; vData.clear(); - switch (vActionId) { // notice we are in receive mode + switch (vMessage.actionId) { // notice we are in receive mode case Gui::GuiActionType::PowerOff: { quint8 mShowHide; ok = getPowerOffData(vMessage, mShowHide); @@ -190,7 +189,7 @@ * \return true if the message CANBUS channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ -bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, Gui::GuiActionType &vActionId, QVariantList &vData) +bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, Gui::GuiActionType vActionId, QVariantList &vData) { Q_UNUSED(vMessage ); Q_UNUSED(vActionId);