Skip to content

Commit ad3e6bf

Browse files
ferdymercuryguitargeek
ferdymercury
authored and
guitargeek
committed
[cont] make functions virtual in upper parents and override in childs in a consistent way
1 parent 88b32e6 commit ad3e6bf

File tree

11 files changed

+45
-8
lines changed

11 files changed

+45
-8
lines changed

‎core/base/src/TUrl.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ void TUrl::ParseOptions() const
647647
fOptionsMap->Add(new TObjString(key), new TObjString(value));
648648
} else {
649649
TString key = ((TObjString *) objTags->At(0))->GetName();
650-
fOptionsMap->Add(new TObjString(key), nullptr);
650+
fOptionsMap->Add(new TObjString(key), static_cast<TObject *>(nullptr));
651651
}
652652
delete objTags;
653653
}

‎core/cont/inc/TBtree.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,17 @@ friend class TBtLeafNode;
7878
TIterator *MakeIterator(Bool_t dir = kIterForward) const override;
7979

8080
void Add(TObject *obj) override;
81+
void Add(TObject *obj, Option_t *) override { Add(obj); };
8182
void AddFirst(TObject *obj) override { Add(obj); }
83+
void AddFirst(TObject *obj, Option_t *) override { Add(obj); }
8284
void AddLast(TObject *obj) override { Add(obj); }
85+
void AddLast(TObject *obj, Option_t *) override { Add(obj); }
8386
void AddAt(TObject *obj, Int_t) override { Add(obj); }
87+
void AddAt(TObject *obj, Int_t, Option_t *) override { Add(obj); }
8488
void AddAfter(const TObject *, TObject *obj) override { Add(obj); }
89+
void AddAfter(const TObject *, TObject *obj, Option_t *) override { Add(obj); }
8590
void AddBefore(const TObject *, TObject *obj) override { Add(obj); }
91+
void AddBefore(const TObject *, TObject *obj, Option_t *) override { Add(obj); }
8692
TObject *Remove(TObject *obj) override;
8793

8894
TObject *At(Int_t idx) const override;

‎core/cont/inc/TClonesArray.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,17 @@ class TClonesArray : public TObjArray {
5454
void SetOwner(Bool_t enable = kTRUE) override;
5555

5656
void AddFirst(TObject *) override { MayNotUse("AddFirst"); }
57+
void AddFirst(TObject *, Option_t *) override { MayNotUse("AddFirst"); }
5758
void AddLast(TObject *) override { MayNotUse("AddLast"); }
59+
void AddLast(TObject *, Option_t *) override { MayNotUse("AddLast"); }
5860
void AddAt(TObject *, Int_t) override { MayNotUse("AddAt"); }
61+
void AddAt(TObject *, Int_t, Option_t *) override { MayNotUse("AddAt"); }
5962
void AddAtAndExpand(TObject *, Int_t) override { MayNotUse("AddAtAndExpand"); }
6063
Int_t AddAtFree(TObject *) override { MayNotUse("AddAtFree"); return 0; }
6164
void AddAfter(const TObject *, TObject *) override { MayNotUse("AddAfter"); }
65+
void AddAfter(const TObject *, TObject *, Option_t *) override { MayNotUse("AddAfter"); }
6266
void AddBefore(const TObject *, TObject *) override { MayNotUse("AddBefore"); }
67+
void AddBefore(const TObject *, TObject *, Option_t *) override { MayNotUse("AddBefore"); }
6368
void BypassStreamer(Bool_t bypass=kTRUE);
6469
Bool_t CanBypassStreamer() const { return TestBit(kBypassStreamer); }
6570
TObject *ConstructedAt(Int_t idx);

‎core/cont/inc/TCollection.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ class TCollection : public TObject {
160160

161161
virtual ~TCollection();
162162
virtual void Add(TObject *obj) = 0;
163+
virtual void Add(TObject */*obj*/, Option_t */*opt*/) { AbstractMethod("Add"); };
163164
void AddVector(TObject *obj1, ...);
164165
virtual void AddAll(const TCollection *col);
165166
Bool_t AssertClass(TClass *cl) const;

‎core/cont/inc/THashTable.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ friend class THashTableIter;
5656
THashTable(Int_t capacity = TCollection::kInitHashTableCapacity, Int_t rehash = 0);
5757
virtual ~THashTable();
5858
void Add(TObject *obj) override;
59+
void Add(TObject *obj, Option_t *) override { Add(obj); };
5960
void AddBefore(const TObject *before, TObject *obj);
6061
void AddAll(const TCollection *col) override;
6162
Float_t AverageCollisions() const;

‎core/cont/inc/TList.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@ friend class TListIter;
7979
TIterator *MakeIterator(Bool_t dir = kIterForward) const override;
8080

8181
void Add(TObject *obj) override { AddLast(obj); }
82-
virtual void Add(TObject *obj, Option_t *opt) { AddLast(obj, opt); }
82+
void Add(TObject *obj, Option_t *opt) override { AddLast(obj, opt); }
8383
void AddFirst(TObject *obj) override;
84-
virtual void AddFirst(TObject *obj, Option_t *opt);
84+
void AddFirst(TObject *obj, Option_t *opt) override;
8585
void AddLast(TObject *obj) override;
86-
virtual void AddLast(TObject *obj, Option_t *opt);
86+
void AddLast(TObject *obj, Option_t *opt) override;
8787
void AddAt(TObject *obj, Int_t idx) override;
88-
virtual void AddAt(TObject *obj, Int_t idx, Option_t *opt);
88+
void AddAt(TObject *obj, Int_t idx, Option_t *opt) override;
8989
void AddAfter(const TObject *after, TObject *obj) override;
9090
virtual void AddAfter(TObjLink *after, TObject *obj);
91-
virtual void AddAfter(const TObject *after, TObject *obj, Option_t *opt);
91+
void AddAfter(const TObject *after, TObject *obj, Option_t *opt) override;
9292
virtual void AddAfter(TObjLink *after, TObject *obj, Option_t *opt);
9393
void AddBefore(const TObject *before, TObject *obj) override;
9494
virtual void AddBefore(TObjLink *before, TObject *obj);
95-
virtual void AddBefore(const TObject *before, TObject *obj, Option_t *opt);
95+
void AddBefore(const TObject *before, TObject *obj, Option_t *opt) override;
9696
virtual void AddBefore(TObjLink *before, TObject *obj, Option_t *opt);
97-
TObject *Remove(TObject *obj) override;
97+
TObject *Remove(TObject *obj) override;
9898
virtual TObject *Remove(TObjLink *lnk);
9999
TObject *Remove(const TObjLinkPtr_t &lnk) { return Remove(lnk.get()); }
100100
void RemoveLast() override;

‎core/cont/inc/TMap.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ friend class TMapIter;
5858
TMap(Int_t capacity = TCollection::kInitHashTableCapacity, Int_t rehash = 0);
5959
virtual ~TMap();
6060
void Add(TObject *obj) override;
61+
void Add(TObject *obj, Option_t *) override { Add(obj); };
6162
void Add(TObject *key, TObject *value);
6263
Float_t AverageCollisions() const;
6364
Int_t Capacity() const;

‎core/cont/inc/TObjArray.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,19 @@ friend class TClonesArray;
6666
TIterator *MakeIterator(Bool_t dir = kIterForward) const override;
6767

6868
void Add(TObject *obj) override { AddLast(obj); }
69+
void Add(TObject *obj, Option_t *) override { AddLast(obj); }
6970
void AddFirst(TObject *obj) override;
71+
void AddFirst(TObject *obj, Option_t *) override { AddFirst(obj); }
7072
void AddLast(TObject *obj) override;
73+
void AddLast(TObject *obj, Option_t *) override { AddLast(obj); }
7174
void AddAt(TObject *obj, Int_t idx) override;
75+
void AddAt(TObject *obj, Int_t idx, Option_t *) override { AddAt(obj, idx); }
7276
virtual void AddAtAndExpand(TObject *obj, Int_t idx);
7377
virtual Int_t AddAtFree(TObject *obj);
7478
void AddAfter(const TObject *after, TObject *obj) override;
79+
void AddAfter(const TObject *after, TObject *obj, Option_t *) override { AddAfter(after, obj); }
7580
void AddBefore(const TObject *before, TObject *obj) override;
81+
void AddBefore(const TObject *before, TObject *obj, Option_t *) override { AddBefore(before, obj); }
7682
TObject *FindObject(const char *name) const override;
7783
TObject *FindObject(const TObject *obj) const override;
7884
TObject *RemoveAt(Int_t idx) override;

‎core/cont/inc/TOrdCollection.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,15 @@ friend class TOrdCollectionIter;
6464
TIterator *MakeIterator(Bool_t dir = kIterForward) const override;
6565

6666
void AddFirst(TObject *obj) override;
67+
void AddFirst(TObject *obj, Option_t *) override { AddFirst(obj); }
6768
void AddLast(TObject *obj) override;
69+
void AddLast(TObject *obj, Option_t *) override { AddLast(obj); }
6870
void AddAt(TObject *obj, Int_t idx) override;
71+
void AddAt(TObject *obj, Int_t idx, Option_t *) override { AddAt(obj, idx); }
6972
void AddAfter(const TObject *after, TObject *obj) override;
73+
void AddAfter(const TObject *after, TObject *obj, Option_t *) override { AddAfter(after, obj); }
7074
void AddBefore(const TObject *before, TObject *obj) override;
75+
void AddBefore(const TObject *before, TObject *obj, Option_t *) override { AddBefore(before, obj); }
7176
void PutAt(TObject *obj, Int_t idx);
7277
TObject *RemoveAt(Int_t idx) override;
7378
TObject *Remove(TObject *obj) override;

‎core/cont/inc/TRefArray.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,19 @@ friend class TRefArrayIter;
7272
TIterator *MakeIterator(Bool_t dir = kIterForward) const override;
7373

7474
void Add(TObject *obj) override { AddLast(obj); }
75+
void Add(TObject *obj, Option_t *opt) override { AddLast(obj, opt); }
7576
void AddFirst(TObject *obj) override;
77+
void AddFirst(TObject *obj, Option_t *) override { AddFirst(obj); }
7678
void AddLast(TObject *obj) override;
79+
void AddLast(TObject *obj, Option_t *) override { AddLast(obj); }
7780
void AddAt(TObject *obj, Int_t idx) override;
81+
void AddAt(TObject *obj, Int_t idx, Option_t *) override { AddAt(obj, idx); }
7882
virtual void AddAtAndExpand(TObject *obj, Int_t idx);
7983
virtual Int_t AddAtFree(TObject *obj);
8084
void AddAfter(const TObject *after, TObject *obj) override;
85+
void AddAfter(const TObject *after, TObject *obj, Option_t *) override { AddAfter(after, obj); }
8186
void AddBefore(const TObject *before, TObject *obj) override;
87+
void AddBefore(const TObject *before, TObject *obj, Option_t *) override { AddBefore(before, obj); }
8288
TObject *RemoveAt(Int_t idx) override;
8389
TObject *Remove(TObject *obj) override;
8490

0 commit comments

Comments
 (0)