From bf92fcc749b2b9a36dbe3470552cadeb51dc720d Mon Sep 17 00:00:00 2001 From: Christian Tacke <58549698+ChristianTackeGSI@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:54:35 +0200 Subject: [PATCH] chore: Drop Fair{ParSet,Container} forward decls and drop some useless includes as well. --- examples/MQ/parameters/FairMQExParamsContFact.h | 3 --- .../advanced/Tutorial3/simulation/FairTestDetectorContFact.h | 4 ---- examples/advanced/propagator/src/FairTutPropContFact.cxx | 2 -- examples/advanced/propagator/src/FairTutPropContFact.h | 3 --- examples/common/passive/FairPassiveContFact.h | 4 ---- examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h | 4 ---- examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h | 4 ---- .../simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h | 4 ---- examples/simulation/rutherford/src/FairRutherfordContFact.h | 4 ---- templates/NewDetector_root_containers/NewDetectorContFact.h | 2 -- templates/NewDetector_stl_containers/NewDetectorContFact.h | 2 -- .../project_root_containers/NewDetector/NewDetectorContFact.h | 2 -- .../project_root_containers/passive/MyPassiveContFact.cxx | 2 -- templates/project_root_containers/passive/MyPassiveContFact.h | 4 ---- .../project_stl_containers/NewDetector/NewDetectorContFact.h | 2 -- .../project_stl_containers/passive/MyPassiveContFact.cxx | 2 -- templates/project_stl_containers/passive/MyPassiveContFact.h | 4 ---- 17 files changed, 52 deletions(-) diff --git a/examples/MQ/parameters/FairMQExParamsContFact.h b/examples/MQ/parameters/FairMQExParamsContFact.h index ccbcb51340..8aa3295e5f 100644 --- a/examples/MQ/parameters/FairMQExParamsContFact.h +++ b/examples/MQ/parameters/FairMQExParamsContFact.h @@ -10,9 +10,6 @@ #include "FairContFact.h" -class FairContainer; -class FairParSet; - class FairMQExParamsContFact : public FairContFact { public: diff --git a/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h b/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h index 5b5f28a5eb..e50b09de72 100644 --- a/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h +++ b/examples/advanced/Tutorial3/simulation/FairTestDetectorContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for ClassDef - -class FairParSet; - class FairTestDetectorContFact : public FairContFact { public: diff --git a/examples/advanced/propagator/src/FairTutPropContFact.cxx b/examples/advanced/propagator/src/FairTutPropContFact.cxx index c9bb8520c6..862ef65f82 100644 --- a/examples/advanced/propagator/src/FairTutPropContFact.cxx +++ b/examples/advanced/propagator/src/FairTutPropContFact.cxx @@ -13,8 +13,6 @@ #include // for strcmp, NULL -class FairParSet; - static FairTutPropContFact gFairTutPropContFact; FairTutPropContFact::FairTutPropContFact() diff --git a/examples/advanced/propagator/src/FairTutPropContFact.h b/examples/advanced/propagator/src/FairTutPropContFact.h index ea2decda72..55ff129315 100644 --- a/examples/advanced/propagator/src/FairTutPropContFact.h +++ b/examples/advanced/propagator/src/FairTutPropContFact.h @@ -9,9 +9,6 @@ #define FAIRTUTPROPCONTFACT_H_ #include "FairContFact.h" // for FairContFact, etc -#include "Rtypes.h" // for ClassDef - -class FairParSet; class FairTutPropContFact : public FairContFact { diff --git a/examples/common/passive/FairPassiveContFact.h b/examples/common/passive/FairPassiveContFact.h index f4196c5c1c..c7a046fa9d 100644 --- a/examples/common/passive/FairPassiveContFact.h +++ b/examples/common/passive/FairPassiveContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for FairPassiveContFact::Class, etc - -class FairParSet; - class FairPassiveContFact : public FairContFact { public: diff --git a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h index 4ee2896270..89f42b2d66 100644 --- a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h +++ b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include - -class FairParSet; - class FairTutorialDet1ContFact : public FairContFact { public: diff --git a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h index de8045d911..050addc977 100644 --- a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h +++ b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" -#include - -class FairParSet; - class FairTutorialDet2ContFact : public FairContFact { public: diff --git a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h index de0feab0e2..14a59b47e4 100644 --- a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h +++ b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for ClassDef - -class FairParSet; - class FairTutorialDet4ContFact : public FairContFact { public: diff --git a/examples/simulation/rutherford/src/FairRutherfordContFact.h b/examples/simulation/rutherford/src/FairRutherfordContFact.h index 9a91b7a7d3..8bd02c56b0 100644 --- a/examples/simulation/rutherford/src/FairRutherfordContFact.h +++ b/examples/simulation/rutherford/src/FairRutherfordContFact.h @@ -10,10 +10,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for ClassDef - -class FairParSet; - class FairRutherfordContFact : public FairContFact { public: diff --git a/templates/NewDetector_root_containers/NewDetectorContFact.h b/templates/NewDetector_root_containers/NewDetectorContFact.h index 2155a414de..f26b7e16ca 100644 --- a/templates/NewDetector_root_containers/NewDetectorContFact.h +++ b/templates/NewDetector_root_containers/NewDetectorContFact.h @@ -10,8 +10,6 @@ #include "FairContFact.h" -class FairContainer; - class NewDetectorContFact : public FairContFact { public: diff --git a/templates/NewDetector_stl_containers/NewDetectorContFact.h b/templates/NewDetector_stl_containers/NewDetectorContFact.h index 2155a414de..f26b7e16ca 100644 --- a/templates/NewDetector_stl_containers/NewDetectorContFact.h +++ b/templates/NewDetector_stl_containers/NewDetectorContFact.h @@ -10,8 +10,6 @@ #include "FairContFact.h" -class FairContainer; - class NewDetectorContFact : public FairContFact { public: diff --git a/templates/project_root_containers/NewDetector/NewDetectorContFact.h b/templates/project_root_containers/NewDetector/NewDetectorContFact.h index 2155a414de..f26b7e16ca 100644 --- a/templates/project_root_containers/NewDetector/NewDetectorContFact.h +++ b/templates/project_root_containers/NewDetector/NewDetectorContFact.h @@ -10,8 +10,6 @@ #include "FairContFact.h" -class FairContainer; - class NewDetectorContFact : public FairContFact { public: diff --git a/templates/project_root_containers/passive/MyPassiveContFact.cxx b/templates/project_root_containers/passive/MyPassiveContFact.cxx index b5834f4379..0e6097bf18 100644 --- a/templates/project_root_containers/passive/MyPassiveContFact.cxx +++ b/templates/project_root_containers/passive/MyPassiveContFact.cxx @@ -27,8 +27,6 @@ #include // for TString #include // for strcmp, NULL -class FairParSet; - static MyPassiveContFact gMyPassiveContFact; MyPassiveContFact::MyPassiveContFact() diff --git a/templates/project_root_containers/passive/MyPassiveContFact.h b/templates/project_root_containers/passive/MyPassiveContFact.h index 734dd018f9..8e11b7d36a 100644 --- a/templates/project_root_containers/passive/MyPassiveContFact.h +++ b/templates/project_root_containers/passive/MyPassiveContFact.h @@ -16,10 +16,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for MyPassiveContFact::Class, etc - -class FairParSet; - class MyPassiveContFact : public FairContFact { public: diff --git a/templates/project_stl_containers/NewDetector/NewDetectorContFact.h b/templates/project_stl_containers/NewDetector/NewDetectorContFact.h index 2155a414de..f26b7e16ca 100644 --- a/templates/project_stl_containers/NewDetector/NewDetectorContFact.h +++ b/templates/project_stl_containers/NewDetector/NewDetectorContFact.h @@ -10,8 +10,6 @@ #include "FairContFact.h" -class FairContainer; - class NewDetectorContFact : public FairContFact { public: diff --git a/templates/project_stl_containers/passive/MyPassiveContFact.cxx b/templates/project_stl_containers/passive/MyPassiveContFact.cxx index b5834f4379..0e6097bf18 100644 --- a/templates/project_stl_containers/passive/MyPassiveContFact.cxx +++ b/templates/project_stl_containers/passive/MyPassiveContFact.cxx @@ -27,8 +27,6 @@ #include // for TString #include // for strcmp, NULL -class FairParSet; - static MyPassiveContFact gMyPassiveContFact; MyPassiveContFact::MyPassiveContFact() diff --git a/templates/project_stl_containers/passive/MyPassiveContFact.h b/templates/project_stl_containers/passive/MyPassiveContFact.h index 734dd018f9..8e11b7d36a 100644 --- a/templates/project_stl_containers/passive/MyPassiveContFact.h +++ b/templates/project_stl_containers/passive/MyPassiveContFact.h @@ -16,10 +16,6 @@ #include "FairContFact.h" // for FairContFact, etc -#include // for MyPassiveContFact::Class, etc - -class FairParSet; - class MyPassiveContFact : public FairContFact { public: