From 7be0b8a25650919730dd4e68d8adfc98ec8c396e Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sun, 4 May 2025 16:49:40 +0300 Subject: [PATCH] [traffxml] Adhere to naming convention for member names Signed-off-by: mvglasow --- traffxml/traff_model.cpp | 4 ++-- traffxml/traff_model.hpp | 4 ++-- traffxml/traff_model_xml.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/traffxml/traff_model.cpp b/traffxml/traff_model.cpp index 8bf9fff8f..cd29d0dd9 100644 --- a/traffxml/traff_model.cpp +++ b/traffxml/traff_model.cpp @@ -181,8 +181,8 @@ std::string DebugPrint(TraffEvent event) { std::ostringstream os; os << "TraffEvent { "; - os << "class: " << DebugPrint(event.m_Class) << ", "; - os << "type: " << DebugPrint(event.m_Type) << ", "; + os << "class: " << DebugPrint(event.m_class) << ", "; + os << "type: " << DebugPrint(event.m_type) << ", "; os << "length: " << (event.m_length ? std::to_string(event.m_length.value()) : "nullopt") << ", "; os << "probability: " << (event.m_probability ? std::to_string(event.m_probability.value()) : "nullopt") << ", "; // TODO optional quantifier diff --git a/traffxml/traff_model.hpp b/traffxml/traff_model.hpp index bc1f521c3..bb76f74f7 100644 --- a/traffxml/traff_model.hpp +++ b/traffxml/traff_model.hpp @@ -162,8 +162,8 @@ struct TraffLocation struct TraffEvent { - EventClass m_Class = EventClass::Invalid; - EventType m_Type = EventType::Invalid; + EventClass m_class = EventClass::Invalid; + EventType m_type = EventType::Invalid; std::optional m_length; std::optional m_probability; // TODO optional quantifier diff --git a/traffxml/traff_model_xml.cpp b/traffxml/traff_model_xml.cpp index 4ad50f25a..58532712d 100644 --- a/traffxml/traff_model_xml.cpp +++ b/traffxml/traff_model_xml.cpp @@ -503,7 +503,7 @@ bool EventFromXml(pugi::xml_node node, TraffEvent & event) LOG(LWARNING, ("No event class specified, ignoring")); return false; } - if (!EnumFromXml(node.attribute("class"), event.m_Class, kEventClassMap)) + if (!EnumFromXml(node.attribute("class"), event.m_class, kEventClassMap)) return false; std::string eventType; @@ -517,7 +517,7 @@ bool EventFromXml(pugi::xml_node node, TraffEvent & event) LOG(LWARNING, ("Event type", eventType, "does not match event class", eventClass, "(ignoring)")); return false; } - if (!EnumFromXml(node.attribute("type"), event.m_Type, kEventTypeMap)) + if (!EnumFromXml(node.attribute("type"), event.m_type, kEventTypeMap)) return false; event.m_length = OptionalIntegerFromXml(node.attribute("length"));