Code cleanup for ConfigurationUpdateCommand

src/nas/msgs/ConfigurationUpdateCommand.cpp

@@ -43,50 +43,52 @@ void ConfigurationUpdateCommand::SetHeader(uint8_t security_header_type) {
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::setFullNameForNetwork(
+void ConfigurationUpdateCommand::SetFullNameForNetwork(
     const NetworkName& name) {
   full_name_for_network = std::optional<NetworkName>(name);
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::setFullNameForNetwork(
+void ConfigurationUpdateCommand::SetFullNameForNetwork(
     const std::string& text_string) {
   NetworkName full_name_for_network_tmp;
   full_name_for_network_tmp.setIEI(kIeiFullNameForNetwork);
   full_name_for_network_tmp.setCodingScheme(0);
   full_name_for_network_tmp.setAddCI(0);
-  full_name_for_network_tmp.setNumberOfSpareBits(0x07);  // TODO:
+  full_name_for_network_tmp.setNumberOfSpareBits(
+      0x07);  // TODO: remove hardcoded value
   full_name_for_network_tmp.setTextString(text_string);
   full_name_for_network = std::optional<NetworkName>(full_name_for_network_tmp);
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::getFullNameForNetwork(
+void ConfigurationUpdateCommand::GetFullNameForNetwork(
     std::optional<NetworkName>& name) const {
   name = full_name_for_network;
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::setShortNameForNetwork(
+void ConfigurationUpdateCommand::SetShortNameForNetwork(
     const std::string& text_string) {
   NetworkName short_name_for_network_tmp;
   short_name_for_network_tmp.setIEI(kIeiShortNameForNetwork);  // TODO
   short_name_for_network_tmp.setCodingScheme(0);
   short_name_for_network_tmp.setAddCI(0);
-  short_name_for_network_tmp.setNumberOfSpareBits(0x07);  // TODO
+  short_name_for_network_tmp.setNumberOfSpareBits(
+      0x07);  // TODO: remove hardcoded value
   short_name_for_network_tmp.setTextString(text_string);
   short_name_for_network =
       std::optional<NetworkName>(short_name_for_network_tmp);
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::setShortNameForNetwork(
+void ConfigurationUpdateCommand::SetShortNameForNetwork(
     const NetworkName& name) {
   short_name_for_network = std::optional<NetworkName>(name);
 }
 
 //------------------------------------------------------------------------------
-void ConfigurationUpdateCommand::getShortNameForNetwork(
+void ConfigurationUpdateCommand::GetShortNameForNetwork(
     NetworkName& name) const {}
 
 //------------------------------------------------------------------------------

src/nas/msgs/ConfigurationUpdateCommand.hpp

@@ -22,9 +22,7 @@
 #ifndef CONFIGURATION_UPDATE_COMMAND_H_
 #define CONFIGURATION_UPDATE_COMMAND_H_
 
-#include <bstrlib.h>
 #include <stdint.h>
-#include <string>
 
 #include "NasIeHeader.hpp"
 namespace nas {
@@ -36,15 +34,15 @@ class ConfigurationUpdateCommand : public NasMmPlainHeader {
 
   void SetHeader(uint8_t security_header_type);
   void GetSecurityHeaderType(uint8_t security_header_type);
-  bool verifyHeader();
+  bool VerifyHeader();
 
-  void setFullNameForNetwork(const NetworkName& name);
-  void setFullNameForNetwork(const std::string& text_string);
-  void getFullNameForNetwork(std::optional<NetworkName>& name) const;
+  void SetFullNameForNetwork(const NetworkName& name);
+  void SetFullNameForNetwork(const std::string& text_string);
+  void GetFullNameForNetwork(std::optional<NetworkName>& name) const;
 
-  void setShortNameForNetwork(const NetworkName& name);
-  void setShortNameForNetwork(const std::string& text_string);
-  void getShortNameForNetwork(NetworkName& name) const;
+  void SetShortNameForNetwork(const NetworkName& name);
+  void SetShortNameForNetwork(const std::string& text_string);
+  void GetShortNameForNetwork(NetworkName& name) const;
 
   int Encode(uint8_t* buf, int len);
   int Decode(uint8_t* buf, int len);