X3DImporter: fix coverity findings.
authorKim Kulling <kim.kulling@googlemail.com>
Tue, 9 May 2017 19:35:21 +0000 (21:35 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Tue, 9 May 2017 19:35:21 +0000 (21:35 +0200)
code/X3DImporter_Node.hpp

index 7d570d2..441d33e 100644 (file)
@@ -467,42 +467,29 @@ public:
 
 /// \class CX3DImporter_NodeElement_Geometry3D
 /// Three-dimensional body.
-class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement
-{
-       /***********************************************/
-       /****************** Variables ******************/
-       /***********************************************/
-
+class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement {
 public:
+       std::list<aiVector3D> Vertices;  ///< Vertices list.
+       size_t                NumIndices;///< Number of indices in one face.
+       bool                  Solid;     ///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
 
-       std::list<aiVector3D> Vertices;///< Vertices list.
-       size_t NumIndices;///< Number of indices in one face.
-       bool Solid;///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
-
-       /***********************************************/
-       /****************** Functions ******************/
-       /***********************************************/
+       /// Constructor.
+       /// \param [in] pParent - pointer to parent node.
+       /// \param [in] pType - type of geometry object.
+       CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
+       : CX3DImporter_NodeElement(pType, pParent)
+       , Vertices()
+       , NumIndices( 0 )
+       , Solid(true) {
+        // empty               
+       }
 
 private:
-
-       /// \fn CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode)
        /// Disabled copy constructor.
        CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
 
-       /// \fn CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode)
        /// Disabled assign operator.
        CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
-
-public:
-
-       /// \fn CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
-       /// Constructor.
-       /// \param [in] pParent - pointer to parent node.
-       /// \param [in] pType - type of geometry object.
-       CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
-               : CX3DImporter_NodeElement(pType, pParent), Solid(true)
-       {}
-
 };// class CX3DImporter_NodeElement_Geometry3D
 
 /// \class CX3DImporter_NodeElement_ElevationGrid