Skip to content

Commit 224598b

Browse files
ChristianTackeGSIdennisklein
ChristianTackeGSI
authored and
dennisklein
committed
geobase: Use override Around
As with parbase, now switch geobase over to use override everywhere. See-Also: f8225d1
1 parent c58d383 commit 224598b

18 files changed

Lines changed: 105 additions & 105 deletions

‎geobase/FairGeoAsciiIo.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ class FairGeoAsciiIo : public FairGeoIo
3535
void setDirectory(const char* fDir) { filedir = fDir; }
3636
const char* getDirectory() { return filedir.Data(); }
3737
const char* getFilename() { return filename.Data(); }
38-
Bool_t open(const char*, const Text_t* status = "in");
39-
Bool_t isOpen();
40-
Bool_t isWritable();
41-
void close();
42-
void print();
43-
Bool_t read(FairGeoMedia*);
44-
Bool_t read(FairGeoSet*, FairGeoMedia*);
45-
Bool_t write(FairGeoMedia*);
46-
Bool_t write(FairGeoSet* set);
47-
Bool_t readGeomConfig(FairGeoInterface*);
38+
Bool_t open(const char*, const Text_t* status = "in") override;
39+
Bool_t isOpen() override;
40+
Bool_t isWritable() override;
41+
void close() override;
42+
void print() override;
43+
Bool_t read(FairGeoMedia*) override;
44+
Bool_t read(FairGeoSet*, FairGeoMedia*) override;
45+
Bool_t write(FairGeoMedia*) override;
46+
Bool_t write(FairGeoSet* set) override;
47+
Bool_t readGeomConfig(FairGeoInterface*) override;
4848
Bool_t readDetectorSetup(FairGeoInterface*);
49-
Bool_t setSimulRefRun(const char*) { return kTRUE; }
50-
Bool_t setHistoryDate(const char*) { return kTRUE; }
49+
Bool_t setSimulRefRun(const char*) override { return kTRUE; }
50+
Bool_t setHistoryDate(const char*) override { return kTRUE; }
5151

5252
private:
5353
FairGeoAsciiIo(const FairGeoAsciiIo&);
5454
FairGeoAsciiIo& operator=(const FairGeoAsciiIo&);
55-
ClassDef(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
55+
ClassDefOverride(FairGeoAsciiIo, 0); // Class for geometry I/O from ASCII file
5656
};
5757

5858
#endif /* !FAIRGEOASCIIIO_H */

‎geobase/FairGeoAssembly.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class FairGeoAssembly : public FairGeoBasicShape
2222
public:
2323
FairGeoAssembly();
2424
~FairGeoAssembly();
25-
TArrayD* calcVoluParam(FairGeoVolume*);
26-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
27-
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu);
28-
Bool_t writePoints(std::fstream*, FairGeoVolume*);
29-
void printPoints(FairGeoVolume* volu);
25+
TArrayD* calcVoluParam(FairGeoVolume*) override;
26+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
27+
Int_t readPoints(std::fstream* pFile, FairGeoVolume* volu) override;
28+
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
29+
void printPoints(FairGeoVolume* volu) override;
3030

31-
ClassDef(FairGeoAssembly, 0); // class for geometry shape ASSEMBLY
31+
ClassDefOverride(FairGeoAssembly, 0); // class for geometry shape ASSEMBLY
3232
};
3333

3434
#endif /* !FAIRGEOASSEMBLY_H */

‎geobase/FairGeoBrik.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class FairGeoBrik : public FairGeoBasicShape
2121
public:
2222
FairGeoBrik();
2323
~FairGeoBrik();
24-
TArrayD* calcVoluParam(FairGeoVolume*);
25-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
26-
ClassDef(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
24+
TArrayD* calcVoluParam(FairGeoVolume*) override;
25+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
26+
ClassDefOverride(FairGeoBrik, 0); // class for geometry shape BOX or BRIK
2727
};
2828

2929
#endif /* !FAIRGEOBRIK_H */

‎geobase/FairGeoCompositeVolume.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class FairGeoCompositeVolume : public FairGeoVolume
2929
FairGeoVolume* getComponent(const Int_t);
3030
void createComponents(const Int_t);
3131
void setComponent(FairGeoVolume*, const Int_t);
32-
void clear();
33-
void print();
34-
ClassDef(FairGeoCompositeVolume, 1);
32+
void clear() override;
33+
void print() override;
34+
ClassDefOverride(FairGeoCompositeVolume, 1);
3535

3636
private:
3737
FairGeoCompositeVolume(const FairGeoCompositeVolume&);

‎geobase/FairGeoCone.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class FairGeoCone : public FairGeoBasicShape
2525
public:
2626
FairGeoCone();
2727
~FairGeoCone();
28-
TArrayD* calcVoluParam(FairGeoVolume*);
29-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
30-
Int_t readPoints(std::fstream*, FairGeoVolume*);
31-
Bool_t writePoints(std::fstream*, FairGeoVolume*);
32-
void printPoints(FairGeoVolume* volu);
33-
ClassDef(FairGeoCone, 0);
28+
TArrayD* calcVoluParam(FairGeoVolume*) override;
29+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
30+
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
31+
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
32+
void printPoints(FairGeoVolume* volu) override;
33+
ClassDefOverride(FairGeoCone, 0);
3434
};
3535

3636
#endif /* !FAIRGEOCONE_H */

‎geobase/FairGeoCons.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ class FairGeoCons : public FairGeoBasicShape
2525
public:
2626
FairGeoCons();
2727
~FairGeoCons();
28-
TArrayD* calcVoluParam(FairGeoVolume*);
29-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
30-
Int_t readPoints(std::fstream*, FairGeoVolume*);
31-
Bool_t writePoints(std::fstream*, FairGeoVolume*);
32-
void printPoints(FairGeoVolume* volu);
28+
TArrayD* calcVoluParam(FairGeoVolume*) override;
29+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
30+
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
31+
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
32+
void printPoints(FairGeoVolume* volu) override;
3333

34-
ClassDef(FairGeoCons, 0);
34+
ClassDefOverride(FairGeoCons, 0);
3535
};
3636

3737
#endif /* !FAIRGEOCONS_H */

‎geobase/FairGeoEltu.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ class FairGeoEltu : public FairGeoBasicShape
2626
public:
2727
FairGeoEltu();
2828
~FairGeoEltu();
29-
TArrayD* calcVoluParam(FairGeoVolume*);
30-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
31-
Int_t readPoints(std::fstream*, FairGeoVolume*);
32-
Bool_t writePoints(std::fstream*, FairGeoVolume*);
33-
void printPoints(FairGeoVolume* volu);
34-
ClassDef(FairGeoEltu, 0);
29+
TArrayD* calcVoluParam(FairGeoVolume*) override;
30+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
31+
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
32+
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
33+
void printPoints(FairGeoVolume* volu) override;
34+
ClassDefOverride(FairGeoEltu, 0);
3535
};
3636

3737
#endif /* !FAIRGEOELTU_H */

‎geobase/FairGeoNode.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ class FairGeoNode : public FairGeoVolume
9797
void setLabTransform(FairGeoTransform&);
9898
Bool_t calcModuleTransform(FairGeoTransform&);
9999
Bool_t calcRefPos(FairGeoVector&);
100-
void clear();
101-
void print();
100+
void clear() override;
101+
void print() override;
102102
Bool_t write(std::fstream&);
103103
Int_t compare(FairGeoNode&);
104104

@@ -112,7 +112,7 @@ class FairGeoNode : public FairGeoVolume
112112
}
113113
}
114114

115-
ClassDef(FairGeoNode, 1); //
115+
ClassDefOverride(FairGeoNode, 1); //
116116
};
117117

118118
// -------------------- inlines --------------------------

‎geobase/FairGeoOldAsciiIo.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ class FairGeoOldAsciiIo : public FairGeoIo
3636
void setDirectory(const char* fDir) { filedir = fDir; }
3737
const char* getDirectory() { return filedir.Data(); }
3838
const char* getFilename() { return filename.Data(); }
39-
Bool_t open(const char*, const Text_t* status = "in");
40-
Bool_t isOpen();
41-
Bool_t isWritable();
42-
void close();
43-
void print();
44-
Bool_t read(FairGeoMedia*) { return kFALSE; }
45-
Bool_t read(FairGeoSet*, FairGeoMedia*);
46-
Bool_t write(FairGeoMedia*) { return kFALSE; }
47-
Bool_t write(FairGeoSet*) { return kFALSE; }
48-
Bool_t readGeomConfig(FairGeoInterface*) { return kFALSE; }
39+
Bool_t open(const char*, const Text_t* status = "in") override;
40+
Bool_t isOpen() override;
41+
Bool_t isWritable() override;
42+
void close() override;
43+
void print() override;
44+
Bool_t read(FairGeoMedia*) override { return kFALSE; }
45+
Bool_t read(FairGeoSet*, FairGeoMedia*) override;
46+
Bool_t write(FairGeoMedia*) override { return kFALSE; }
47+
Bool_t write(FairGeoSet*) override { return kFALSE; }
48+
Bool_t readGeomConfig(FairGeoInterface*) override { return kFALSE; }
4949
Bool_t readDetectorSetup(FairGeoInterface*) { return kFALSE; }
50-
Bool_t setSimulRefRun(const char*) { return kTRUE; }
51-
Bool_t setHistoryDate(const char*) { return kTRUE; }
50+
Bool_t setSimulRefRun(const char*) override { return kTRUE; }
51+
Bool_t setHistoryDate(const char*) override { return kTRUE; }
5252

5353
private:
5454
Bool_t calculateShapePoints(Double_t*, FairGeoNode*);
5555
FairGeoOldAsciiIo(const FairGeoOldAsciiIo&);
5656
FairGeoOldAsciiIo& operator=(const FairGeoOldAsciiIo&);
5757

58-
ClassDef(FairGeoOldAsciiIo, 0); //
58+
ClassDefOverride(FairGeoOldAsciiIo, 0); //
5959
};
6060

6161
#endif /* !FAIRGEOOLDASCIIIO_H */

‎geobase/FairGeoPcon.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ class FairGeoPcon : public FairGeoBasicShape
2626
public:
2727
FairGeoPcon();
2828
~FairGeoPcon();
29-
TArrayD* calcVoluParam(FairGeoVolume*);
30-
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&);
31-
Int_t readPoints(std::fstream*, FairGeoVolume*);
32-
Bool_t writePoints(std::fstream*, FairGeoVolume*);
33-
void printPoints(FairGeoVolume* volu);
34-
ClassDef(FairGeoPcon, 0); //
29+
TArrayD* calcVoluParam(FairGeoVolume*) override;
30+
void calcVoluPosition(FairGeoVolume*, const FairGeoTransform&, const FairGeoTransform&) override;
31+
Int_t readPoints(std::fstream*, FairGeoVolume*) override;
32+
Bool_t writePoints(std::fstream*, FairGeoVolume*) override;
33+
void printPoints(FairGeoVolume* volu) override;
34+
ClassDefOverride(FairGeoPcon, 0); //
3535
};
3636

3737
#endif /* !FAIRGEOPCON_H */

0 commit comments

Comments
 (0)