X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-set.cpp;fp=low-can-binding%2Fcan%2Fcan-message-set.cpp;h=69682e1acacae5cc88d58248f55f90f710d6596c;hb=refs%2Fchanges%2F07%2F21407%2F10;hp=a5cf8819f2f1cb2ee78488875cab08fdbdeef1a0;hpb=d2180abe18533be7cbe68971a6767e5c2a0ecf6d;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-message-set.cpp b/low-can-binding/can/message-set.cpp
similarity index 59%
rename from low-can-binding/can/can-message-set.cpp
rename to low-can-binding/can/message-set.cpp
index a5cf8819..69682e1a 100644
--- a/low-can-binding/can/can-message-set.cpp
+++ b/low-can-binding/can/message-set.cpp
@@ -16,44 +16,44 @@
  * limitations under the License.
  */
 
-#include "can-message-set.hpp"
+#include "message-set.hpp"
 
-#include "../can/can-message-definition.hpp"
+#include "../can/message-definition.hpp"
 
-can_message_set_t::can_message_set_t(
+message_set_t::message_set_t(
 		uint8_t index,
 		const std::string& name,
-		const std::vector<std::shared_ptr<can_message_definition_t> >& can_messages_definition,
+		const std::vector<std::shared_ptr<message_definition_t> >& messages_definition,
 		const std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages)
 	: index_{index}
 	, name_{name}
-	, can_messages_definition_{can_messages_definition}
+	, messages_definition_{messages_definition}
 	, diagnostic_messages_{diagnostic_messages}
 {}
 
 /// @brief Returns a vector holding all message definitions which are handled by this message set.
-std::vector<std::shared_ptr<can_message_definition_t> >& can_message_set_t::get_can_message_definition()
+std::vector<std::shared_ptr<message_definition_t>>& message_set_t::get_messages_definition()
 {
-	return can_messages_definition_;
+	return messages_definition_;
 }
 
-std::vector<std::shared_ptr<can_signal_t> > can_message_set_t::get_all_can_signals() const
+std::vector<std::shared_ptr<signal_t>> message_set_t::get_all_signals() const
 {
-	std::vector<std::shared_ptr<can_signal_t> > can_signals;
-	for(const auto& cmd: can_messages_definition_)
+	std::vector<std::shared_ptr<signal_t> > signals;
+	for(const auto& cmd: messages_definition_)
 	{
-		std::vector<std::shared_ptr<can_signal_t> >& cmd_signals = cmd->get_can_signals();
-		can_signals.insert( can_signals.end(),
+		std::vector<std::shared_ptr<signal_t>> cmd_signals = cmd->get_signals();
+		signals.insert( signals.end(),
 							cmd_signals.begin(),
 							cmd_signals.end()
 		);
 	}
 
-	return can_signals;
+	return signals;
 }
 
 /// @brief Returns a vector holding all diagnostic message definitions which are handled by this message set.
-std::vector<std::shared_ptr<diagnostic_message_t> >& can_message_set_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t>>& message_set_t::get_diagnostic_messages()
 {
 	return diagnostic_messages_;
-}
\ No newline at end of file
+}