Upgrade cpplint and fix new errors

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Aug 31, 2021 · f5c8bb3 · f5c8bb3
1 parent e0d77cc
commit f5c8bb3
Show file tree

Hide file tree

Showing 31 changed files with 4,881 additions and 1,316 deletions.
diff --git a/include/sdf/Element.hh b/include/sdf/Element.hh
@@ -206,7 +206,7 @@ namespace sdf
                               const std::string &_type,
                               const std::string &_defaultvalue,
                               bool _required,
-                              const std::string &_description="");
+                              const std::string &_description = "");
 
     /// \brief Add a value to this Element.
     /// \param[in] _type Type of data the attribute will hold.
@@ -216,7 +216,7 @@ namespace sdf
     /// \throws sdf::AssertionInternalError if an invalid type is given.
     public: void AddValue(const std::string &_type,
                           const std::string &_defaultValue, bool _required,
-                          const std::string &_description="");
+                          const std::string &_description = "");
 
     /// \brief Get the param of an attribute.
     /// \param[in] _key the name of the attribute.
@@ -499,7 +499,7 @@ namespace sdf
                                   const std::string &_type,
                                   const std::string &_defaultValue,
                                   bool _required,
-                                  const std::string &_description="");
+                                  const std::string &_description = "");
 
 
     /// \brief Private data pointer

diff --git a/src/Converter_TEST.cc b/src/Converter_TEST.cc
@@ -1885,10 +1885,16 @@ TEST(Converter, MuchNewerVersion)
   ASSERT_TRUE(sdf::Converter::Convert(&xmlDoc, "1.6"));
 }
 
-const std::string CONVERT_DOC_15_16 =
-  sdf::filesystem::append(PROJECT_SOURCE_PATH, "sdf", "1.6", "1_5.convert");
-const std::string CONVERT_DOC_16_17 =
-  sdf::filesystem::append(PROJECT_SOURCE_PATH, "sdf", "1.7", "1_6.convert");
+static std::string ConvertDoc_15_16()
+{
+  return sdf::filesystem::append(PROJECT_SOURCE_PATH, "sdf", "1.6",
+                                 "1_5.convert");
+}
+static std::string ConvertDoc_16_17()
+{
+  return sdf::filesystem::append(PROJECT_SOURCE_PATH, "sdf", "1.7",
+                                 "1_6.convert");
+}
 
 /////////////////////////////////////////////////
 /// Test conversion of imu in 1.5 to 1.6
@@ -1930,7 +1936,7 @@ TEST(Converter, IMU_15_to_16)
 
   // Convert
   TiXmlDocument convertXmlDoc;
-  convertXmlDoc.LoadFile(CONVERT_DOC_15_16);
+  convertXmlDoc.LoadFile(ConvertDoc_15_16());
   sdf::Converter::Convert(&xmlDoc, &convertXmlDoc);
 
   // Check some basic elements
@@ -2024,7 +2030,7 @@ TEST(Converter, World_15_to_16)
 
   // Convert
   TiXmlDocument convertXmlDoc;
-  convertXmlDoc.LoadFile(CONVERT_DOC_15_16);
+  convertXmlDoc.LoadFile(ConvertDoc_15_16());
   sdf::Converter::Convert(&xmlDoc, &convertXmlDoc);
 
   // Check some basic elements
@@ -2080,7 +2086,7 @@ TEST(Converter, Pose_16_to_17)
 
   // Convert
   TiXmlDocument convertXmlDoc;
-  convertXmlDoc.LoadFile(CONVERT_DOC_16_17);
+  convertXmlDoc.LoadFile(ConvertDoc_16_17());
   sdf::Converter::Convert(&xmlDoc, &convertXmlDoc);
 
   // Check some basic elements

diff --git a/src/Error.cc b/src/Error.cc
@@ -39,7 +39,6 @@ std::string Error::Message() const
 }
 
 /////////////////////////////////////////////////
-// cppcheck-suppress unusedFunction
 Error::operator bool() const
 {
   return this->code != ErrorCode::NONE;

diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc
@@ -15,6 +15,7 @@
  *
 */
 #include <string>
+#include <set>
 #include <utility>
 #include <vector>
 

diff --git a/src/Joint.cc b/src/Joint.cc
@@ -67,7 +67,6 @@ class sdf::JointPrivate
   public: double threadPitch = 1.0;
 
   /// \brief Joint axis
-  // cppcheck-suppress
   public: std::array<std::unique_ptr<JointAxis>, 2> axis;
 
   /// \brief The SDF element pointer used during load.

diff --git a/src/Light.cc b/src/Light.cc
@@ -122,7 +122,7 @@ Light &Light::operator=(Light &&_light)
 //////////////////////////////////////////////////
 void Light::CopyFrom(const Light &_light)
 {
-  this->dataPtr->name= _light.dataPtr->name;
+  this->dataPtr->name = _light.dataPtr->name;
   this->dataPtr->pose = _light.dataPtr->pose;
   this->dataPtr->poseRelativeTo = _light.dataPtr->poseRelativeTo;
   this->dataPtr->type = _light.dataPtr->type;
@@ -251,7 +251,7 @@ Errors Light::Load(ElementPtr _sdf)
     this->SetSpotInnerAngle(doubleValue.first);
 
     // Check for and set outer_angle
-    doubleValue =spotElem->Get<double>(
+    doubleValue = spotElem->Get<double>(
         "outer_angle", this->dataPtr->spotOuterAngle.Radian());
     if (!doubleValue.second)
     {
@@ -261,7 +261,7 @@ Errors Light::Load(ElementPtr _sdf)
     this->SetSpotOuterAngle(doubleValue.first);
 
     // Check for and set falloff
-    doubleValue =spotElem->Get<double>("falloff", this->dataPtr->spotFalloff);
+    doubleValue = spotElem->Get<double>("falloff", this->dataPtr->spotFalloff);
     if (!doubleValue.second)
     {
       errors.push_back({ErrorCode::ELEMENT_MISSING,

diff --git a/src/Link.cc b/src/Link.cc
@@ -490,5 +490,5 @@ bool Link::EnableWind() const
 /////////////////////////////////////////////////
 void Link::SetEnableWind(const bool _enableWind)
 {
-  this->dataPtr->enableWind =_enableWind;
+  this->dataPtr->enableWind = _enableWind;
 }
diff --git a/src/Model.cc b/src/Model.cc
@@ -495,7 +495,7 @@ bool Model::EnableWind() const
 /////////////////////////////////////////////////
 void Model::SetEnableWind(const bool _enableWind)
 {
-  this->dataPtr->enableWind =_enableWind;
+  this->dataPtr->enableWind = _enableWind;
 }
 
 /////////////////////////////////////////////////

diff --git a/src/Noise.cc b/src/Noise.cc
@@ -123,7 +123,7 @@ Errors Noise::Load(ElementPtr _sdf)
   else if (typeLower == "gaussian")
     this->dataPtr->type = NoiseType::GAUSSIAN;
   else if (typeLower == "gaussian_quantized")
-    this->dataPtr->type =NoiseType::GAUSSIAN_QUANTIZED;
+    this->dataPtr->type = NoiseType::GAUSSIAN_QUANTIZED;
   else
   {
     errors.push_back({ErrorCode::ELEMENT_MISSING,

diff --git a/src/Pbr.cc b/src/Pbr.cc
@@ -206,7 +206,7 @@ Errors PbrWorkflow::Load(sdf::ElementPtr _sdf)
   this->dataPtr->albedoMap = _sdf->Get<std::string>("albedo_map",
       this->dataPtr->albedoMap).first;
 
-  this->dataPtr->normalMap= _sdf->Get<std::string>("normal_map",
+  this->dataPtr->normalMap = _sdf->Get<std::string>("normal_map",
     this->dataPtr->normalMap).first;
 
   this->dataPtr->environmentMap = _sdf->Get<std::string>("environment_map",

diff --git a/src/SDF.cc b/src/SDF.cc
@@ -46,7 +46,9 @@ static URIPathMap g_uriPathMap;
 
 static std::function<std::string(const std::string &)> g_findFileCB;
 
-std::string SDF::version = SDF_VERSION;
+// TODO(azeey) This violates the Google style guide. Change to a function that
+// returns the version string when possible.
+std::string SDF::version = SDF_VERSION;  // NOLINT(runtime/string)
 
 /////////////////////////////////////////////////
 // cppcheck-suppress passedByValue
@@ -325,9 +327,7 @@ void SDF::PrintDoc()
 
   std::cout << "</div>\n";
 
-  std::cout << "\
-    </body>\
-    </html>\n";
+  std::cout << "    </body>    </html>\n";
 }
 
 /////////////////////////////////////////////////

diff --git a/src/Scene.cc b/src/Scene.cc
@@ -128,7 +128,7 @@ Errors Scene::Load(ElementPtr _sdf)
   }
 
   // Get the ambient property
-  this->dataPtr->ambient= _sdf->Get<ignition::math::Color>("ambient",
+  this->dataPtr->ambient = _sdf->Get<ignition::math::Color>("ambient",
       this->dataPtr->ambient).first;
 
   // Get the background color property

diff --git a/src/Utils.hh b/src/Utils.hh
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 #include <vector>
 #include "sdf/Error.hh"
 #include "sdf/Element.hh"