Import Geant4 11.0.0 source tree

source/analysis/management/include/G4P2Messenger.hh

@@ -34,6 +34,7 @@
 
 #include "G4UImessenger.hh"
 #include "G4AnalysisMessengerHelper.hh"
+#include "G4AnalysisUtilities.hh"
 #include "globals.hh"
 
 #include <memory>
@@ -46,36 +47,37 @@ class G4P2Messenger : public G4UImessenger
 {
   public:
     explicit G4P2Messenger(G4VAnalysisManager* manager);
+    G4P2Messenger() = delete;
     virtual ~G4P2Messenger();
-   
-    // methods
+
+    // Methods
     virtual void SetNewValue(G4UIcommand* command, G4String value) final;
-    
+
   private:
     void CreateP2Cmd();
     void SetP2Cmd();
- 
-    G4VAnalysisManager*  fManager; ///< Associated class
-    std::unique_ptr<G4AnalysisMessengerHelper> fHelper; 
+
+    G4VAnalysisManager*  fManager { nullptr }; ///< Associated class
+    std::unique_ptr<G4AnalysisMessengerHelper> fHelper;
     std::unique_ptr<G4UIdirectory>  fDirectory;
-    
+
     std::unique_ptr<G4UIcommand>  fCreateP2Cmd;
     std::unique_ptr<G4UIcommand>  fSetP2Cmd;
     std::unique_ptr<G4UIcommand>  fSetP2XCmd;
     std::unique_ptr<G4UIcommand>  fSetP2YCmd;
     std::unique_ptr<G4UIcommand>  fSetP2ZCmd;
-    std::unique_ptr<G4UIcommand>  fSetP2TitleCmd;   
-    std::unique_ptr<G4UIcommand>  fSetP2XAxisCmd;   
-    std::unique_ptr<G4UIcommand>  fSetP2YAxisCmd;   
-    std::unique_ptr<G4UIcommand>  fSetP2ZAxisCmd;   
+    std::unique_ptr<G4UIcommand>  fSetP2TitleCmd;
+    std::unique_ptr<G4UIcommand>  fSetP2XAxisCmd;
+    std::unique_ptr<G4UIcommand>  fSetP2YAxisCmd;
+    std::unique_ptr<G4UIcommand>  fSetP2ZAxisCmd;
     std::unique_ptr<G4UIcommand>  fSetP2XAxisLogCmd;
     std::unique_ptr<G4UIcommand>  fSetP2YAxisLogCmd;
     std::unique_ptr<G4UIcommand>  fSetP2ZAxisLogCmd;
 
-    G4int  fXId;
-    G4int  fYId;
+    G4int  fXId { G4Analysis::kInvalidId };
+    G4int  fYId { G4Analysis::kInvalidId };
     G4AnalysisMessengerHelper::BinData fXData;
     G4AnalysisMessengerHelper::BinData fYData;
 };
-  
+
 #endif