Import Geant4 11.2.0 source tree

examples/extended/field/field06/include/F06ActionInitialization.hh

@@ -37,11 +37,11 @@
 class F06ActionInitialization : public G4VUserActionInitialization
 {
   public:
-    F06ActionInitialization();
-    virtual ~F06ActionInitialization();
+    F06ActionInitialization() = default;
+    ~F06ActionInitialization() override = default;
 
-    virtual void BuildForMaster() const;
-    virtual void Build() const;
+    void BuildForMaster() const override;
+    void Build() const override;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/field/field06/include/F06DetectorConstruction.hh

@@ -38,7 +38,7 @@
 #include "globals.hh"
 
 class G4Material;
- 
+
 class G4Box;
 class G4LogicalVolume;
 class G4VPhysicalVolume;
@@ -51,28 +51,20 @@ class G4FieldManager;
 class F06DetectorConstruction : public G4VUserDetectorConstruction
 {
   public:
- 
-    F06DetectorConstruction();
-    virtual ~F06DetectorConstruction();
 
-  public:
- 
-    virtual G4VPhysicalVolume* Construct();
-    virtual void ConstructSDandField();
+    F06DetectorConstruction();
+    ~F06DetectorConstruction() override;
+
+    G4VPhysicalVolume* Construct() override;
+    void ConstructSDandField() override;
 
   private:
- 
-     G4Material*        fVacuum;
+     void DefineMaterials();
 
-     G4Box*             fSolidWorld;    //pointer to the solid World
-     G4LogicalVolume*   fLogicWorld;    //pointer to the logical World
-     G4VPhysicalVolume* fPhysiWorld;    //pointer to the physical World
+     G4Material* fVacuum = nullptr;
 
      static G4ThreadLocal G4UniformGravityField* fField;
 
-  private:
- 
-     void DefineMaterials();
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/field/field06/include/F06PhysicsList.hh

@@ -41,17 +41,15 @@ class G4VPhysicsConstructor;
 
 class F06PhysicsList: public G4VModularPhysicsList
 {
-public:
+  public:
 
     F06PhysicsList();
-    virtual ~F06PhysicsList();
+    ~F06PhysicsList() override = default;
 
-    virtual void ConstructParticle();
-    virtual void ConstructProcess();
+    void ConstructParticle() override;
+    void ConstructProcess() override;
 
-    void SetCuts();
-
-private:
+    void SetCuts() override;
 
 };
 

examples/extended/field/field06/include/F06PrimaryGeneratorAction.hh

@@ -44,16 +44,16 @@ class G4ParticleGun;
 
 class F06PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
-public:
+  public:
 
-  F06PrimaryGeneratorAction(void);    
-  virtual ~F06PrimaryGeneratorAction();
+    F06PrimaryGeneratorAction();
+    ~F06PrimaryGeneratorAction() override;
 
-  virtual void GeneratePrimaries(G4Event*);
+  void GeneratePrimaries(G4Event*) override;
 
-private:
+  private:
 
-  G4ParticleGun* fParticleGun;
+    G4ParticleGun* fParticleGun = nullptr;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......