Skip to content

Commit 400d4c7

Browse files
linevlinev
committed
Use override syntax in TTree
1 parent 9946ddf commit 400d4c7

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎tree/tree/inc/TTree.h‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
413413
virtual TBranch *Bronch(const char* name, const char* classname, void* addobj, Int_t bufsize = 32000, Int_t splitlevel = 99);
414414
virtual TBranch *BranchOld(const char* name, const char* classname, void* addobj, Int_t bufsize = 32000, Int_t splitlevel = 1);
415415
virtual TBranch *BranchRef();
416-
virtual void Browse(TBrowser*);
416+
void Browse(TBrowser*) override;
417417
virtual Int_t BuildIndex(const char* majorname, const char* minorname = "0");
418418
TStreamerInfo *BuildStreamerInfo(TClass* cl, void* pointer = 0, Bool_t canOptimize = kTRUE);
419419
virtual TFile *ChangeFile(TFile* file);
@@ -423,9 +423,9 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
423423
virtual TTree *CopyTree(const char* selection, Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
424424
virtual TBasket *CreateBasket(TBranch*);
425425
virtual void DirectoryAutoAdd(TDirectory *);
426-
Int_t Debug() const { return fDebug; }
427-
virtual void Delete(Option_t* option = ""); // *MENU*
428-
virtual void Draw(Option_t* opt) { Draw(opt, "", "", kMaxEntries, 0); }
426+
Int_t Debug() const { return fDebug; }
427+
void Delete(Option_t* option = "") override; // *MENU*
428+
void Draw(Option_t* opt) override { Draw(opt, "", "", kMaxEntries, 0); }
429429
virtual Long64_t Draw(const char* varexp, const TCut& selection, Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
430430
virtual Long64_t Draw(const char* varexp, const char* selection, Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0); // *MENU*
431431
virtual void DropBaskets();
@@ -436,9 +436,9 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
436436
virtual Int_t Fit(const char* funcname, const char* varexp, const char* selection = "", Option_t* option = "", Option_t* goption = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0); // *MENU*
437437
virtual Int_t FlushBaskets(Bool_t create_cluster = true) const;
438438
virtual const char *GetAlias(const char* aliasName) const;
439-
UInt_t GetAllocationCount() const { return fAllocationCount; }
439+
UInt_t GetAllocationCount() const { return fAllocationCount; }
440440
#ifdef R__TRACK_BASKET_ALLOC_TIME
441-
ULong64_t GetAllocationTime() const { return fAllocationTime; }
441+
ULong64_t GetAllocationTime() const { return fAllocationTime; }
442442
#endif
443443
virtual Long64_t GetAutoFlush() const {return fAutoFlush;}
444444
virtual Long64_t GetAutoSave() const {return fAutoSave;}
@@ -451,7 +451,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
451451
virtual Long64_t GetChainEntryNumber(Long64_t entry) const { return entry; }
452452
virtual Long64_t GetChainOffset() const { return fChainOffset; }
453453
virtual Bool_t GetClusterPrefetch() const { return fCacheDoClusterPrefetch; }
454-
TFile *GetCurrentFile() const;
454+
TFile *GetCurrentFile() const;
455455
Int_t GetDefaultEntryOffsetLen() const {return fDefaultEntryOffsetLen;}
456456
Long64_t GetDebugMax() const { return fDebugMax; }
457457
Long64_t GetDebugMin() const { return fDebugMin; }
@@ -472,7 +472,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
472472
virtual Int_t GetFileNumber() const { return fFileNumber; }
473473
virtual TTree *GetFriend(const char*) const;
474474
virtual const char *GetFriendAlias(TTree*) const;
475-
TH1 *GetHistogram() { return GetPlayer()->GetHistogram(); }
475+
TH1 *GetHistogram() { return GetPlayer()->GetHistogram(); }
476476
virtual Bool_t GetImplicitMT() { return fIMTEnabled; }
477477
virtual Int_t *GetIndex() { return &fIndex.fArray[0]; }
478478
virtual Double_t *GetIndexValues() { return &fIndexValues.fArray[0]; }
@@ -496,7 +496,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
496496
virtual Long64_t GetMaxVirtualSize() const { return fMaxVirtualSize; }
497497
virtual Double_t GetMinimum(const char* columname);
498498
virtual Int_t GetNbranches() { return fBranches.GetEntriesFast(); }
499-
TObject *GetNotify() const { return fNotify; }
499+
TObject *GetNotify() const { return fNotify; }
500500
TVirtualTreePlayer *GetPlayer();
501501
virtual Int_t GetPacketSize() const { return fPacketSize; }
502502
virtual TVirtualPerfStats *GetPerfStats() const { return fPerfStats; }
@@ -505,7 +505,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
505505
virtual Long64_t GetReadEntry() const { return fReadEntry; }
506506
virtual Long64_t GetReadEvent() const { return fReadEntry; }
507507
virtual Int_t GetScanField() const { return fScanField; }
508-
TTreeFormula *GetSelect() { return GetPlayer()->GetSelect(); }
508+
TTreeFormula *GetSelect() { return GetPlayer()->GetSelect(); }
509509
virtual Long64_t GetSelectedRows() { return GetPlayer()->GetSelectedRows(); }
510510
virtual Int_t GetTimerInterval() const { return fTimerInterval; }
511511
TBuffer* GetTransientBuffer(Int_t size);
@@ -540,7 +540,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
540540
virtual Double_t GetWeight() const { return fWeight; }
541541
virtual Long64_t GetZipBytes() const { return fZipBytes; }
542542
virtual void IncrementTotalBuffers(Int_t nbytes) { fTotalBuffers += nbytes; }
543-
Bool_t IsFolder() const { return kTRUE; }
543+
Bool_t IsFolder() const override { return kTRUE; }
544544
virtual Bool_t InPlaceClone(TDirectory *newdirectory, const char *options = "");
545545
virtual Int_t LoadBaskets(Long64_t maxmemory = 2000000000);
546546
virtual Long64_t LoadTree(Long64_t entry);
@@ -553,10 +553,10 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
553553
virtual Long64_t Merge(TCollection* list, Option_t* option = "");
554554
virtual Long64_t Merge(TCollection* list, TFileMergeInfo *info);
555555
static TTree *MergeTrees(TList* list, Option_t* option = "");
556-
virtual Bool_t Notify();
556+
Bool_t Notify() override;
557557
virtual void OptimizeBaskets(ULong64_t maxMemory=10000000, Float_t minComp=1.1, Option_t *option="");
558-
TPrincipal *Principal(const char* varexp = "", const char* selection = "", Option_t* option = "np", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
559-
virtual void Print(Option_t* option = "") const; // *MENU*
558+
TPrincipal *Principal(const char* varexp = "", const char* selection = "", Option_t* option = "np", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
559+
void Print(Option_t* option = "") const override; // *MENU*
560560
virtual void PrintCacheStats(Option_t* option = "") const;
561561
virtual Long64_t Process(const char* filename, Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0); // *MENU*
562562
virtual Long64_t Process(TSelector* selector, Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
@@ -568,7 +568,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
568568
virtual void RegisterExternalFriend(TFriendElement *);
569569
virtual void RemoveExternalFriend(TFriendElement *);
570570
virtual void RemoveFriend(TTree*);
571-
virtual void RecursiveRemove(TObject *obj);
571+
void RecursiveRemove(TObject *obj) override;
572572
virtual void Reset(Option_t* option = "");
573573
virtual void ResetAfterMerge(TFileMergeInfo *);
574574
virtual void ResetBranchAddress(TBranch *);
@@ -619,7 +619,7 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
619619
virtual void SetMaxEntryLoop(Long64_t maxev = kMaxEntries) { fMaxEntryLoop = maxev; } // *MENU*
620620
static void SetMaxTreeSize(Long64_t maxsize = 100000000000LL);
621621
virtual void SetMaxVirtualSize(Long64_t size = 0) { fMaxVirtualSize = size; } // *MENU*
622-
virtual void SetName(const char* name); // *MENU*
622+
void SetName(const char* name) override; // *MENU*
623623

624624
/**
625625
* @brief Sets the address of the object to be notified when the tree is loaded.
@@ -646,11 +646,11 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
646646
virtual void StartViewer(); // *MENU*
647647
virtual Int_t StopCacheLearningPhase();
648648
virtual Int_t UnbinnedFit(const char* funcname, const char* varexp, const char* selection = "", Option_t* option = "", Long64_t nentries = kMaxEntries, Long64_t firstentry = 0);
649-
void UseCurrentStyle();
650-
virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
651-
virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;
649+
void UseCurrentStyle() override;
650+
Int_t Write(const char *name=nullptr, Int_t option=0, Int_t bufsize=0) override;
651+
Int_t Write(const char *name=nullptr, Int_t option=0, Int_t bufsize=0) const override;
652652

653-
ClassDef(TTree, 20) // Tree descriptor (the main ROOT I/O class)
653+
ClassDefOverride(TTree, 20) // Tree descriptor (the main ROOT I/O class)
654654
};
655655

656656
//////////////////////////////////////////////////////////////////////////
@@ -669,33 +669,33 @@ class TTreeFriendLeafIter : public TIterator {
669669
TIterator *fTreeIter; ///< current tree sub-iterator.
670670
Bool_t fDirection; ///< iteration direction
671671

672-
TTreeFriendLeafIter() : fTree(0), fLeafIter(0), fTreeIter(0),
673-
fDirection(0) { }
672+
TTreeFriendLeafIter() : fTree(nullptr), fLeafIter(nullptr), fTreeIter(nullptr),
673+
fDirection(kFALSE) { }
674674

675675
public:
676676
TTreeFriendLeafIter(const TTree* t, Bool_t dir = kIterForward);
677677
TTreeFriendLeafIter(const TTreeFriendLeafIter &iter);
678678
~TTreeFriendLeafIter() { SafeDelete(fLeafIter); SafeDelete(fTreeIter); }
679-
TIterator &operator=(const TIterator &rhs);
679+
TIterator &operator=(const TIterator &rhs) override;
680680
TTreeFriendLeafIter &operator=(const TTreeFriendLeafIter &rhs);
681681

682-
const TCollection *GetCollection() const { return 0; }
683-
Option_t *GetOption() const;
684-
TObject *Next();
685-
void Reset() { SafeDelete(fLeafIter); SafeDelete(fTreeIter); }
686-
Bool_t operator !=(const TIterator&) const {
682+
const TCollection *GetCollection() const override { return nullptr; }
683+
Option_t *GetOption() const override;
684+
TObject *Next() override;
685+
void Reset() override { SafeDelete(fLeafIter); SafeDelete(fTreeIter); }
686+
Bool_t operator !=(const TIterator&) const override {
687687
// TODO: Implement me
688688
return false;
689689
}
690690
Bool_t operator !=(const TTreeFriendLeafIter&) const {
691691
// TODO: Implement me
692692
return false;
693693
}
694-
TObject *operator*() const {
694+
TObject *operator*() const override {
695695
// TODO: Implement me
696696
return nullptr;
697697
}
698-
ClassDef(TTreeFriendLeafIter,0) //Linked list iterator
698+
ClassDefOverride(TTreeFriendLeafIter,0) //Linked list iterator
699699
};
700700

701701

‎tree/tree/inc/TVirtualTreePlayer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class TVirtualTreePlayer : public TObject {
100100
static TVirtualTreePlayer *TreePlayer(TTree *obj);
101101
static void SetPlayer(const char *player);
102102

103-
ClassDef(TVirtualTreePlayer,0); //Abstract interface for Tree players
103+
ClassDefOverride(TVirtualTreePlayer,0); //Abstract interface for Tree players
104104
};
105105

106106
#endif

0 commit comments

Comments
 (0)