Remove unused and useless members.

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / can / can-message-set.cpp

diff --git a/CAN-binder/low-can-binding/can/can-message-set.cpp b/CAN-binder/low-can-binding/can/can-message-set.cpp
index 1877f3a..46dc448 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-message-set.cpp
+++ b/CAN-binder/low-can-binding/can/can-message-set.cpp
@@ -21,24 +21,14 @@
 can_message_set_t::can_message_set_t(
                uint8_t index,
                const std::string& name,
-               uint8_t can_bus_count,
-               unsigned short can_message_count,
-               unsigned short can_signal_count,
-               unsigned short can_command_count,
-               unsigned short obd2_signal_count,
                std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition)
        : index_{index}
        , name_{name}
-       , can_bus_count_{can_bus_count}
-       , can_message_count_{can_message_count}
-       , can_signal_count_{can_signal_count}
-       , can_command_count_{can_command_count}
-       , obd2_signal_count_{obd2_signal_count}
        , can_messages_definition_{can_messages_definition}
 {
        for(auto& cmd : can_messages_definition_)
        {
-               cmd->set_parent(std::make_shared<can_message_set_t>(this));
+               cmd->set_parent(std::make_shared<can_message_set_t>(*this));
        }
 }
 
@@ -50,12 +40,13 @@ std::vector<std::shared_ptr<can_message_definition_t> > can_message_set_t::get_c
 
 std::vector<std::shared_ptr<can_signal_t> > can_message_set_t::get_can_signals() const
 {
-       std::vector<std::shared_ptr<can_signal_t> > can_signals(can_signal_count_);
+       std::vector<std::shared_ptr<can_signal_t> > can_signals;
        for(const auto& cmd: can_messages_definition_)
        {
+               std::vector<std::shared_ptr<can_signal_t> > cmd_signals = cmd->get_can_signals();
                can_signals.insert( can_signals.end(),
-                                                                       cmd->get_can_signals().begin(),
-                                                                       cmd->get_can_signals().end()
+                                                       cmd_signals.begin(),
+                                                       cmd_signals.end()
                );
        }