Import Geant4 11.3.0 source tree

source/visualization/gMocren/History

@@ -6,6 +6,15 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-09-29 John Allison (gMocren-V11-02-02)
+- More Coverity fixes
+
+## 2024-08-31 John Allison (gMocren-V11-02-01)
+- More Coverity fixes
+
+## 2024-07-17 John Allison (gMocren-V11-02-00)
+- Coverity fixes
+
 ## 2023-02-06 Ben Morgan (gMocren-V11-01-00)
 - Isolate private headers and update dependencies
 

source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc

@@ -90,6 +90,8 @@
 #include "G4PhysicalConstants.hh"
 #include "G4SystemOfUnits.hh"
 
+#include <utility>
+
 //----- constants
 const char  GDD_FILE_HEADER      [] = "g4_";
 const char  DEFAULT_GDD_FILE_NAME[] = "g4_00.gdd";
@@ -1713,7 +1715,7 @@ void G4GMocrenFileSceneHandler::AddCompound( const G4VHit & hit) {
 	    } else {
 	      std::map<Index3D, G4double> hits;
 	      hits.insert(std::map<Index3D, G4double>::value_type(id, value));
-	      kNestedHitsList[hitNames[i]] = hits;
+	      kNestedHitsList[hitNames[i]] = std::move(hits);
 	    }
 
 	    
@@ -1775,7 +1777,7 @@ void G4GMocrenFileSceneHandler::AddCompound(const G4THitsMap<G4double> & hits) {
 	} else {
 	  std::map<Index3D, G4double> hit;
 	  hit.insert(std::map<Index3D, G4double>::value_type(id, *(itr->second)));
-	  kNestedHitsList[scorername] = hit;
+	  kNestedHitsList[scorername] = std::move(hit);
 	}
       }
  
@@ -1847,7 +1849,7 @@ void G4GMocrenFileSceneHandler::AddCompound(const G4THitsMap<G4StatDouble> & hit
 	} else {
 	  std::map<Index3D, G4double> hit;
 	  hit.insert(std::map<Index3D, G4double>::value_type(id, itr->second->sum_wx()));
-	  kNestedHitsList[scorername] = hit;
+	  kNestedHitsList[scorername] = std::move(hit);
 	}
       }
  

source/visualization/gMocren/src/G4GMocrenMessenger.cc

@@ -37,6 +37,8 @@
 #include "G4UIcommand.hh"
 #include "G4Tokenizer.hh"
 
+#include <utility>
+
 G4GMocrenMessenger::G4GMocrenMessenger()
   : suffix (""), geometry(true), pointAttributes(false), solids(true), invisibles(true),
     kgMocrenVolumeName("gMocrenVolume"),
@@ -198,7 +200,7 @@ G4String G4GMocrenMessenger::GetCurrentValue(G4UIcommand * command) {
 
 void G4GMocrenMessenger::SetNewValue(G4UIcommand * command, G4String newValue) {
   if (command==setEventNumberSuffixCommand) {
-    suffix = newValue;
+    suffix = std::move(newValue);
   } else if (command==appendGeometryCommand) {
     geometry = appendGeometryCommand->GetNewBoolValue(newValue);
   } else if (command==addPointAttributesCommand) {
@@ -208,15 +210,15 @@ void G4GMocrenMessenger::SetNewValue(G4UIcommand * command, G4String newValue) {
     //    } else if (command==writeInvisiblesCommand) {
     //        invisibles = writeInvisiblesCommand->GetNewBoolValue(newValue);
   } else if (command == kSetgMocrenVolumeNameCommand) {
-    kgMocrenVolumeName = newValue;
+    kgMocrenVolumeName = std::move(newValue);
   } else if (command == kAddgMocrenHitNameCommand) {
-    kgMocrenHitNames.push_back(newValue);
+    kgMocrenHitNames.push_back(std::move(newValue));
   } else if (command == kResetgMocrenHitNameCommand) {
     kgMocrenHitNames.clear();
   } else if (command == kSetgMocrenScoringMeshNameCommand) {
-    kgMocrenScoringMeshName = newValue;
+    kgMocrenScoringMeshName = std::move(newValue);
   } else if (command == kAddgMocrenHitScorerNameCommand) {
-    kgMocrenHitScorerNames.push_back(newValue);
+    kgMocrenHitScorerNames.push_back(std::move(newValue));
   } else if (command == kResetgMocrenHitScorerNameCommand) {
     kgMocrenHitScorerNames.clear();
   } else if (command == kListgMocrenCommand) {