CppCheck fixes (#1148)

Signed-off-by: Maksim Derbasov <[email protected]>
(cherry picked from commit ff4cb13)

Author: ntfshard

CMakeLists.txt

@@ -88,14 +88,14 @@ gz_find_package(GzOGRE VERSION 1.9.0
   REQUIRED_BY ogre
   PRIVATE_FOR ogre)
 
-# Ogre versions greater than 1.9.x are not officialy supported.
+# Ogre versions greater than 1.9.x are not officially supported.
 # Display a warning for the users on this setup unless they provide
 # USE_UNOFFICIAL_OGRE_VERSIONS flag
 if (NOT USE_UNOFFICIAL_OGRE_VERSIONS)
   if (OGRE_VERSION VERSION_GREATER_EQUAL 1.10.0)
     GZ_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported."
-                      "The software might compile and even work but support from upstream"
-                      "could be reduced to accepting patches for newer versions")
+                     "The software might compile and even work but support from upstream"
+                     "could be reduced to accepting patches for newer versions")
   endif()
 endif()
 

examples/lux_core_engine/LuxCoreEngineMeshFactory.cc

@@ -44,27 +44,27 @@ LuxCoreEngineMeshFactory::Create(const MeshDescriptor &_desc,
 
   struct Coordinate
   {
-    float x, y;
+    float x{}, y{};
 
     Coordinate(float x, float y) : x(x), y(y) {}
-    Coordinate() {}
+    Coordinate() = default;
   };
 
   struct Vertex
   {
-    float x, y, z;
+    float x{}, y{}, z{};
 
     Vertex(float x, float y, float z) : x(x), y(y), z(z) {}
-    Vertex() {}
+    Vertex() = default;
   };
 
   struct VertexTriangle
   {
-    unsigned int v1, v2, v3;
+    unsigned int v1{}, v2{}, v3{};
 
     VertexTriangle(unsigned int v1, unsigned int v2, unsigned int v3)
         : v1(v1), v2(v2), v3(v3) {}
-    VertexTriangle() {}
+    VertexTriangle() = default;
   };
 
   if (_desc.meshName == "unit_box")

examples/visualization_demo/GlutWindow.cc

@@ -23,7 +23,7 @@
   #define NOMINMAX
   // Must include this before GL/gl.h
   #include <windows.h>
-  #include <GL/glew.h
+  #include <GL/glew.h>
   // OpenGL utilities header file
   #include <GL/glu.h>
   // OpenGL utilities header file

ogre/src/OgreCamera.cc

@@ -164,11 +164,11 @@ void OgreCamera::SyncOgreCameraAspectRatio()
 void OgreCamera::CreateCamera()
 {
   // create ogre camera object
-  Ogre::SceneManager *ogreSceneManager;
-  ogreSceneManager = this->scene->OgreSceneManager();
+  Ogre::SceneManager *ogreSceneManager = this->scene->OgreSceneManager();
   if (ogreSceneManager == nullptr)
   {
     gzerr << "Scene manager cannot be obtained" << std::endl;
+    return;
   }
 
   this->ogreCamera = ogreSceneManager->createCamera(this->name);

ogre/src/OgreRenderEngine.cc

@@ -479,7 +479,6 @@ void OgreRenderEngine::LoadPlugins()
 //////////////////////////////////////////////////
 void OgreRenderEngine::CreateRenderSystem()
 {
-  Ogre::RenderSystem *renderSys;
   const Ogre::RenderSystemList *rsList;
 
   // Set parameters of render system (window size, etc.)
@@ -491,7 +490,7 @@ void OgreRenderEngine::CreateRenderSystem()
 
   int c = 0;
 
-  renderSys = nullptr;
+  Ogre::RenderSystem *renderSys = nullptr;
 
   do
   {
@@ -512,6 +511,7 @@ void OgreRenderEngine::CreateRenderSystem()
     gzerr << "unable to find OpenGL rendering system. OGRE is probably "
             "installed incorrectly. Double check the OGRE cmake output, "
             "and make sure OpenGL is enabled." << std::endl;
+    return;
   }
 
   // We operate in windowed mode

ogre2/src/Ogre2Camera.cc

@@ -61,16 +61,18 @@ void Ogre2Camera::Destroy()
   this->RemoveAllRenderPasses();
   this->DestroyRenderTexture();
 
-  Ogre::SceneManager *ogreSceneManager;
-  ogreSceneManager = this->scene->OgreSceneManager();
+  Ogre::SceneManager *ogreSceneManager = this->scene->OgreSceneManager();
   if (ogreSceneManager == nullptr)
   {
     gzerr << "Scene manager cannot be obtained" << std::endl;
   }
-  if (ogreSceneManager->findCameraNoThrow(this->name) != nullptr)
+  else
   {
-    ogreSceneManager->destroyCamera(this->ogreCamera);
-    this->ogreCamera = nullptr;
+    if (ogreSceneManager->findCameraNoThrow(this->name) != nullptr)
+    {
+      ogreSceneManager->destroyCamera(this->ogreCamera);
+      this->ogreCamera = nullptr;
+    }
   }
 
   if (this->selectionBuffer)