remove unused includes in geom sources

stlukyanenko · Jun 3, 2020 · d4d1a95 · d4d1a95
1 parent 1f21854
commit d4d1a95
Show file tree

Hide file tree

Showing 33 changed files with 38 additions and 54 deletions.
diff --git a/geom/geom/src/TGeoArb8.cxx b/geom/geom/src/TGeoArb8.cxx
@@ -11,7 +11,7 @@
 
 #include "TGeoArb8.h"
 
-#include "Riostream.h"
+#include <iostream>
 #include "TBuffer.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"

diff --git a/geom/geom/src/TGeoBBox.cxx b/geom/geom/src/TGeoBBox.cxx
@@ -115,14 +115,13 @@ Both cases are supported by all shapes.
 See also class TGeoShape for utility methods provided by any particular shape.
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoBBox.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoBoolNode.cxx b/geom/geom/src/TGeoBoolNode.cxx
@@ -12,7 +12,7 @@
  *************************************************************************/
 #include "TGeoBoolNode.h"
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TVirtualPad.h"
 #include "TVirtualViewer3D.h"

diff --git a/geom/geom/src/TGeoCompositeShape.cxx b/geom/geom/src/TGeoCompositeShape.cxx
@@ -164,7 +164,7 @@ rules (see TGeoVolume). Volumes created based on composite shapes cannot be
 divided. Visualization of such volumes is currently not implemented.
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TRandom3.h"
 
 #include "TGeoManager.h"

diff --git a/geom/geom/src/TGeoCone.cxx b/geom/geom/src/TGeoCone.cxx
@@ -66,13 +66,12 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoCone.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoElement.cxx b/geom/geom/src/TGeoElement.cxx
@@ -36,7 +36,8 @@ Table of elements
 
 #include "RConfigure.h"
 
-#include "Riostream.h"
+#include <fstream>
+#include <iomanip>
 
 #include "TSystem.h"
 #include "TROOT.h"

diff --git a/geom/geom/src/TGeoEltu.cxx b/geom/geom/src/TGeoEltu.cxx
@@ -37,7 +37,7 @@ End_Macro
 */
 
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoVolume.h"

diff --git a/geom/geom/src/TGeoHalfSpace.cxx b/geom/geom/src/TGeoHalfSpace.cxx
@@ -19,7 +19,7 @@ A half-space is not really a shape, because it is infinite. The normal
 points "outside" the half-space
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TGeoHalfSpace.h"
 #include "TMath.h"
 

diff --git a/geom/geom/src/TGeoHype.cxx b/geom/geom/src/TGeoHype.cxx
@@ -10,13 +10,12 @@
  *************************************************************************/
 
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoHype.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoManager.cxx b/geom/geom/src/TGeoManager.cxx
@@ -234,13 +234,12 @@ in order to enhance rays.
 \image html geom_random2.jpg
 */
 
-#include <stdlib.h>
-
-#include "Riostream.h"
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
 
 #include "TROOT.h"
 #include "TGeoManager.h"
-#include "TSystem.h"
 #include "TStyle.h"
 #include "TVirtualPad.h"
 #include "TBrowser.h"
@@ -287,7 +286,7 @@ in order to enhance rays.
 
 // statics and globals
 
-TGeoManager *gGeoManager = 0;
+TGeoManager *gGeoManager = nullptr;
 
 ClassImp(TGeoManager);
 

diff --git a/geom/geom/src/TGeoMaterial.cxx b/geom/geom/src/TGeoMaterial.cxx
@@ -17,7 +17,7 @@ Base class describing materials.
 \image html geom_material.jpg
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TMath.h"
 #include "TObjArray.h"
 #include "TGeoElement.h"

diff --git a/geom/geom/src/TGeoMatrix.cxx b/geom/geom/src/TGeoMatrix.cxx
@@ -210,14 +210,14 @@ A generic singleton matrix representing a identity transformation
    NOTE: identified by the global variable gGeoIdentity.
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TObjArray.h"
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 #include "TMath.h"
 
-TGeoIdentity *gGeoIdentity = 0;
+TGeoIdentity *gGeoIdentity = nullptr;
 const Int_t kN3 = 3*sizeof(Double_t);
 const Int_t kN9 = 9*sizeof(Double_t);
 

diff --git a/geom/geom/src/TGeoMedium.cxx b/geom/geom/src/TGeoMedium.cxx
@@ -23,7 +23,7 @@ The media parameters are inspired from GEANT3 and the values defined make sense
 in context of GEANT (3 but also 4) or FLUKA interfaces.
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TGeoManager.h"
 #include "TGeoMedium.h"
 #include "TList.h"

diff --git a/geom/geom/src/TGeoNode.cxx b/geom/geom/src/TGeoNode.cxx
@@ -68,7 +68,7 @@ painting a node on a pad will take the corresponding volume attributes.
 \image html geom_t_node.png
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TBrowser.h"
 #include "TObjArray.h"

diff --git a/geom/geom/src/TGeoPara.cxx b/geom/geom/src/TGeoPara.cxx
@@ -41,7 +41,7 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoParaboloid.cxx b/geom/geom/src/TGeoParaboloid.cxx
@@ -29,12 +29,11 @@ The parameters a and b are automatically computed from:
           |  dz = a*rhi*rhi + b      where: rlo != rhi, both >= 0
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoParaboloid.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoPatternFinder.cxx b/geom/geom/src/TGeoPatternFinder.cxx
@@ -27,7 +27,6 @@ on different axis. Implemented patterns are:
 
 #include "TGeoPatternFinder.h"
 
-#include "Riostream.h"
 #include "TBuffer.h"
 #include "TObject.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoPcon.cxx b/geom/geom/src/TGeoPcon.cxx
@@ -48,14 +48,14 @@ End_Macro
 
 #include "TGeoPcon.h"
 
-#include "Riostream.h"
+#include <iostream>
+
 #include "TBuffer.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoTube.h"
 #include "TGeoCone.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoPgon.cxx b/geom/geom/src/TGeoPgon.cxx
@@ -47,15 +47,15 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
 
 #include "TGeoPgon.h"
 
+#include <iostream>
+
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoTube.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoPhysicalNode.cxx b/geom/geom/src/TGeoPhysicalNode.cxx
@@ -56,7 +56,6 @@ matrix.
 For more details please read the misalignment section in the Users Guide.
 */
 
-#include "TClass.h"
 #include "TGeoManager.h"
 #include "TGeoVoxelFinder.h"
 #include "TGeoCache.h"

diff --git a/geom/geom/src/TGeoScaledShape.cxx b/geom/geom/src/TGeoScaledShape.cxx
@@ -10,7 +10,7 @@
  *************************************************************************/
 
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoShapeAssembly.cxx b/geom/geom/src/TGeoShapeAssembly.cxx
@@ -9,9 +9,6 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-
-#include "Riostream.h"
-
 #include "TGeoManager.h"
 #include "TGeoVoxelFinder.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoSphere.cxx b/geom/geom/src/TGeoSphere.cxx
@@ -41,14 +41,13 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoCone.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoSphere.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoTessellated.cxx b/geom/geom/src/TGeoTessellated.cxx
@@ -18,19 +18,17 @@ quadrilateral shape. The class does not provide navigation functionality, it jus
 for the composing faces.
 */
 
-#include "Riostream.h"
+#include <iostream>
 #include <sstream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoTessellated.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"
-#include "TRandom.h"
 
 #include <array>
 #include <vector>

diff --git a/geom/geom/src/TGeoTorus.cxx b/geom/geom/src/TGeoTorus.cxx
@@ -39,14 +39,13 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TGeoTube.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoTorus.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoTrd1.cxx b/geom/geom/src/TGeoTrd1.cxx
@@ -36,7 +36,7 @@ Begin_Macro
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoTrd2.cxx b/geom/geom/src/TGeoTrd2.cxx
@@ -35,7 +35,7 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoMatrix.h"

diff --git a/geom/geom/src/TGeoTube.cxx b/geom/geom/src/TGeoTube.cxx
@@ -109,13 +109,12 @@ Begin_Macro(source)
 End_Macro
 */
 
-#include "Riostream.h"
+#include <iostream>
 
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
 #include "TVirtualGeoPainter.h"
 #include "TGeoTube.h"
-#include "TVirtualPad.h"
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
 #include "TMath.h"

diff --git a/geom/geom/src/TGeoVolume.cxx b/geom/geom/src/TGeoVolume.cxx
@@ -377,14 +377,15 @@ To define an assembly one should just input a name, then start adding other
 volumes (or volume assemblies) as content.
 */
 
-#include "Riostream.h"
+#include <fstream>
+#include <iomanip>
+
 #include "TString.h"
 #include "TBuffer.h"
 #include "TBrowser.h"
 #include "TStyle.h"
 #include "TH2F.h"
 #include "TROOT.h"
-#include "TClass.h"
 #include "TEnv.h"
 #include "TMap.h"
 #include "TFile.h"

diff --git a/geom/geom/src/TGeoVoxelFinder.cxx b/geom/geom/src/TGeoVoxelFinder.cxx
@@ -24,7 +24,6 @@ Full description with examples and pictures
 #include "TGeoVoxelFinder.h"
 
 #include "TBuffer.h"
-#include "TObject.h"
 #include "TMath.h"
 #include "TGeoMatrix.h"
 #include "TGeoBBox.h"

diff --git a/geom/geom/src/TGeoXtru.cxx b/geom/geom/src/TGeoXtru.cxx
@@ -54,11 +54,10 @@ within x3d produces incorrect end-faces
 
 #include "TGeoXtru.h"
 
-#include "Riostream.h"
-#include "TVirtualPad.h"
+#include <iostream>
+
 #include "TBuffer3D.h"
 #include "TBuffer3DTypes.h"
-#include "TClass.h"
 #include "TMath.h"
 
 #include "TVirtualGeoPainter.h"

diff --git a/geom/geompainter/src/TGeoChecker.cxx b/geom/geompainter/src/TGeoChecker.cxx
@@ -83,7 +83,7 @@ volume by material sampling. Accepts as input the desired precision.
 #include "TBuffer3DTypes.h"
 #include "TMath.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 // statics and globals