Import Geant4 10.6.0 source tree

source/geometry/solids/Boolean/include/G4DisplacedSolid.hh

@@ -23,10 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-//
-//
-//
-// class G4DisplacedSolid
+// G4DisplacedSolid
 //
 // Class description:
 //
@@ -34,14 +31,10 @@
 // frame of reference to a new one. It is meant to be used only for
 // simplifying the implementation of "Boolean solids". 
 
-// History:
-//
-// 28.10.98 V.Grichine: created
-// 22.11.00 V.Grichine: new set methods for matrix/vectors
-//
+// 28.10.98 V.Grichine - created
 // --------------------------------------------------------------------
-#ifndef G4DisplacedSolid_HH
-#define G4DisplacedSolid_HH
+#ifndef G4DISPLACEDSOLID_HH
+#define G4DISPLACEDSOLID_HH
 
 #include "G4VSolid.hh"
 #include "G4RotationMatrix.hh"
@@ -116,27 +109,27 @@ class G4DisplacedSolid : public G4VSolid
       // If the Solid is a "G4DisplacedSolid",
       // return a self pointer else return 0.
 
-    G4VSolid*                GetConstituentMovedSolid() const;
+    G4VSolid* GetConstituentMovedSolid() const;
 
-    G4AffineTransform        GetTransform() const; 
+    G4AffineTransform GetTransform() const; 
     void       SetTransform(G4AffineTransform& ); 
 
-    G4AffineTransform        GetDirectTransform() const; 
+    G4AffineTransform GetDirectTransform() const; 
     void       SetDirectTransform(G4AffineTransform&); 
       // Access/Set methods.
 
-    G4RotationMatrix         GetFrameRotation() const;
-    void  SetFrameRotation(const G4RotationMatrix&);
+    G4RotationMatrix GetFrameRotation() const;
+    void SetFrameRotation(const G4RotationMatrix&);
 
-    G4ThreeVector            GetFrameTranslation() const; 
-    void  SetFrameTranslation(const G4ThreeVector&); 
+    G4ThreeVector GetFrameTranslation() const; 
+    void SetFrameTranslation(const G4ThreeVector&); 
       // Get/Set the rotation/translation, as applied to the frame of reference.
 
-    G4RotationMatrix         GetObjectRotation() const;
-    void  SetObjectRotation(const G4RotationMatrix&);
+    G4RotationMatrix GetObjectRotation() const;
+    void SetObjectRotation(const G4RotationMatrix&);
 
-    G4ThreeVector            GetObjectTranslation() const; 
-    void  SetObjectTranslation(const G4ThreeVector&); 
+    G4ThreeVector GetObjectTranslation() const; 
+    void SetObjectTranslation(const G4ThreeVector&); 
       // Get/Set the rotation/translation, as applied to the object.
 
     std::ostream& StreamInfo(std::ostream& os) const;
@@ -154,16 +147,16 @@ class G4DisplacedSolid : public G4VSolid
 
     void DescribeYourselfTo ( G4VGraphicsScene& scene ) const ;
     G4Polyhedron* CreatePolyhedron () const ;
-    G4Polyhedron* GetPolyhedron    () const ;
+    G4Polyhedron* GetPolyhedron () const ;
       // For creating graphical representations (ie for visualisation).
 
   protected:
 
-    G4VSolid* fPtrSolid ;
-    G4AffineTransform* fPtrTransform ;
-    G4AffineTransform* fDirectTransform ;
-    mutable G4bool fRebuildPolyhedron;
-    mutable G4Polyhedron* fpPolyhedron;
-} ;
+    G4VSolid* fPtrSolid = nullptr;
+    G4AffineTransform* fPtrTransform = nullptr;
+    G4AffineTransform* fDirectTransform = nullptr;
+    mutable G4bool fRebuildPolyhedron = false;
+    mutable G4Polyhedron* fpPolyhedron = nullptr;
+};
 
 #endif