[NFC] Apply clang-tidy member initializer fixes to TEntryList.

Author: hageboeck

tree/tree/inc/TEntryList.h

@@ -28,27 +28,27 @@ class TEntryList: public TNamed
    TEntryList& operator=(const TEntryList&); // Not implemented
 
  protected:
-   TList      *fLists;                  ///<  a list of underlying entry lists for each tree of a chain
-   TEntryList *fCurrent;                ///<! currently filled entry list
-
-   Int_t            fNBlocks;           ///<  number of TEntryListBlocks
-   TObjArray       *fBlocks;            ///<  blocks with indices of passing events (TEntryListBlocks)
-   Long64_t         fN;                 ///<  number of entries in the list
-   Long64_t         fEntriesToProcess;  ///<  used on proof to set the number of entries to process in a packet
-   TString          fTreeName;          ///<  name of the tree
-   TString          fFileName;          ///<  name of the file, where the tree is
-   ULong_t          fStringHash;        ///<! Hash value of a string of treename and filename
-   Int_t            fTreeNumber;        ///<! the index of the tree in the chain (used when the entry
-                                        ///<  list is used as input (TTree::SetEntryList())
-
-   Long64_t         fLastIndexQueried;  ///<! used to optimize GetEntry() function from a loop
-   Long64_t         fLastIndexReturned; ///<! used to optimize GetEntry() function from a loop
-   bool             fShift;             ///<! true when some sub-lists don't correspond to trees
-                                        ///<  (when the entry list is used as input in TChain)
-   TDirectory      *fDirectory;         ///<! Pointer to directory holding this tree
-   bool             fReapply;           ///<  If true, TTree::Draw will 'reapply' the original cut
-
-   void             GetFileName(const char *filename, TString &fn, bool * = nullptr);
+   TList *fLists = nullptr;        ///<  a list of underlying entry lists for each tree of a chain
+   TEntryList *fCurrent = nullptr; ///<! currently filled entry list
+
+   Int_t fNBlocks = 0;             ///<  number of TEntryListBlocks
+   TObjArray *fBlocks = nullptr;   ///<  blocks with indices of passing events (TEntryListBlocks)
+   Long64_t fN = 0;                ///<  number of entries in the list
+   Long64_t fEntriesToProcess = 0; ///<  used on proof to set the number of entries to process in a packet
+   TString fTreeName;              ///<  name of the tree
+   TString fFileName;              ///<  name of the file, where the tree is
+   ULong_t fStringHash = 0;        ///<! Hash value of a string of treename and filename
+   Int_t fTreeNumber = -1;         ///<! the index of the tree in the chain (used when the entry
+                                   ///<  list is used as input (TTree::SetEntryList())
+
+   Long64_t fLastIndexQueried = -1; ///<! used to optimize GetEntry() function from a loop
+   Long64_t fLastIndexReturned = 0; ///<! used to optimize GetEntry() function from a loop
+   bool fShift = false;             ///<! true when some sub-lists don't correspond to trees
+                                    ///<  (when the entry list is used as input in TChain)
+   TDirectory *fDirectory = nullptr; ///<! Pointer to directory holding this tree
+   bool fReapply = false;           ///<  If true, TTree::Draw will 'reapply' the original cut
+
+   void GetFileName(const char *filename, TString &fn, bool * = nullptr);
 
  public:
    enum {kBlockSize = 64000}; //number of entries in each block (not the physical size).

tree/tree/src/TEntryList.cxx

@@ -165,136 +165,71 @@ End_Macro
 ////////////////////////////////////////////////////////////////////////////////
 /// default c-tor
 
-TEntryList::TEntryList() : fEntriesToProcess(0)
-{
-   fLists = nullptr;
-   fCurrent = nullptr;
-   fBlocks = nullptr;
-   fN = 0;
-   fNBlocks = 0;
-   fTreeName = "";
-   fFileName = "";
-   fStringHash = 0;
-   fTreeNumber = -1;
-   fDirectory = nullptr;
-   fReapply = false;
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fShift = false;
-}
+TEntryList::TEntryList() = default;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// c-tor with name and title
 
-TEntryList::TEntryList(const char *name, const char *title) :
-   TNamed(name, title),
-   fEntriesToProcess(0)
+TEntryList::TEntryList(const char *name, const char *title) : TNamed(name, title)
 {
-   fLists = nullptr;
-   fCurrent = nullptr;
-   fBlocks = nullptr;
-   fN = 0;
-   fNBlocks = 0;
-   fTreeName = "";
-   fFileName = "";
-   fStringHash = 0;
-   fTreeNumber = -1;
-   fReapply = false;
 
    fDirectory  = gDirectory;
-   if (fDirectory) fDirectory->Append(this);
-
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fShift = false;
+   if (fDirectory)
+      fDirectory->Append(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// constructor with name and title, which also sets the tree
 
-TEntryList::TEntryList(const char *name, const char *title, const TTree *tree):TNamed(name, title)
+TEntryList::TEntryList(const char *name, const char *title, const TTree *tree) : TNamed(name, title)
 {
-   fLists = nullptr;
-   fCurrent = nullptr;
-   fBlocks = nullptr;
-   fN = 0;
-   fNBlocks = 0;
-   fTreeNumber = -1;
    TEntryList::SetTree(tree);
-   fReapply = false;
 
    fDirectory  = gDirectory;
-   if (fDirectory) fDirectory->Append(this);
-
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fShift = false;
+   if (fDirectory)
+      fDirectory->Append(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// c-tor with name and title, which also sets the treename and the filename
 
-TEntryList::TEntryList(const char *name, const char *title, const char *treename, const char *filename) : TNamed(name, title),fEntriesToProcess(0)
+TEntryList::TEntryList(const char *name, const char *title, const char *treename, const char *filename)
+   : TNamed(name, title)
 {
-   fLists = nullptr;
-   fCurrent = nullptr;
-   fBlocks = nullptr;
-   fNBlocks = 0;
-   fN = 0;
    SetTree(treename, filename);
-   fTreeNumber = -1;
-   fReapply = false;
 
    fDirectory  = gDirectory;
-   if (fDirectory) fDirectory->Append(this);
-
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fShift = false;
+   if (fDirectory)
+      fDirectory->Append(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// c-tor, which sets the tree
 
-TEntryList::TEntryList(const TTree *tree) : fEntriesToProcess(0)
+TEntryList::TEntryList(const TTree *tree)
 {
-   fLists = nullptr;
-   fCurrent = nullptr;
-   fBlocks = nullptr;
-   fNBlocks = 0;
-   fN = 0;
-
    SetTree(tree);
-   fTreeNumber = -1;
 
-   fReapply = false;
    fDirectory  = gDirectory;
-   if (fDirectory) fDirectory->Append(this);
-
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fShift = false;
+   if (fDirectory)
+      fDirectory->Append(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// copy c-tor
 
-TEntryList::TEntryList(const TEntryList &elist) : TNamed(elist)
+TEntryList::TEntryList(const TEntryList &elist)
+   : TNamed(elist),
+     fNBlocks(elist.fNBlocks),
+     fN(elist.fN),
+     fEntriesToProcess(elist.fEntriesToProcess),
+     fTreeName(elist.fTreeName),
+     fFileName(elist.fFileName),
+     fStringHash(elist.fStringHash),
+     fTreeNumber(elist.fTreeNumber),
+     fShift(elist.fShift),
+     fReapply(elist.fReapply)
 {
-   fNBlocks = elist.fNBlocks;
-   fTreeName = elist.fTreeName;
-   fFileName = elist.fFileName;
-   fStringHash = elist.fStringHash;
-   fTreeNumber = elist.fTreeNumber;
-   fLastIndexQueried = -1;
-   fLastIndexReturned = 0;
-   fN = elist.fN;
-   fShift = elist.fShift;
-   fLists = nullptr;
-   fBlocks = nullptr;
-   fReapply = elist.fReapply;
-   fCurrent = nullptr;
-   fEntriesToProcess = elist.fEntriesToProcess;
    if (elist.fLists){
       fLists = new TList();
       TEntryList *el1 = nullptr;
@@ -320,8 +255,6 @@ TEntryList::TEntryList(const TEntryList &elist) : TNamed(elist)
       }
       fCurrent = this;
    }
-   fDirectory  = nullptr;
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////