Fix eff-c++ warnings.
authormtadel <mtadel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Jun 2009 11:55:16 +0000 (11:55 +0000)
committermtadel <mtadel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Jun 2009 11:55:16 +0000 (11:55 +0000)
EVE/EveBase/AliEveEventSelector.cxx
EVE/EveBase/AliEveEventSelector.h
EVE/EveBase/AliEveEventSelectorWindow.cxx
EVE/EveBase/AliEveEventSelectorWindow.h

index e15d0a3..ecfdbfe 100644 (file)
@@ -33,8 +33,9 @@ AliEveEventSelector::AliEveEventSelector(AliEveEventManager* evman):
   fWrapAround(kFALSE),
   fSelectOnString(kFALSE),
   fString(""),
-  fPEntryList(NULL),
+  fPEntryList(0),
   fEntryListId(0),
+  fLastTreeSize(-1),
   fSelectOnTriggerType(kFALSE),
   fTriggerType(""),
   fSelectOnTriggerString(kFALSE),
index 99aaf7d..b787465 100644 (file)
@@ -36,8 +36,8 @@ public:
   AliEveEventManager* GetEventManager() { return fPEventManager; }
   TTree* GetESDTree() const { return fPEventManager->GetESDTree(); }
 
-  Bool_t         FindNext(Int_t& i);
-  Bool_t         FindPrev(Int_t& i);
+  Bool_t FindNext(Int_t& i);
+  Bool_t FindPrev(Int_t& i);
   
   void SetSelectionString( const TString& str );
   void SetSelectionString( const char* str );
@@ -79,22 +79,22 @@ private:
   AliEveEventManager *fPEventManager; //event manager
   Bool_t fWrapAround;                 //go back to the first event after the last?
   
-  Bool_t fSelectOnString;             //whether to select on string expression
+  Bool_t  fSelectOnString;            //whether to select on string expression
   TString fString;                    //expression to select on
   TEntryList* fPEntryList;            //list of enry numbers after selection
   Int_t  fEntryListId;                //current entry no. in entry list
-  Int_t fLastTreeSize;                //stores the last treesize
+  Int_t  fLastTreeSize;               //stores the last treesize
 
-  Bool_t fSelectOnTriggerType;        //whether to select on trigger type
+  Bool_t  fSelectOnTriggerType;       //whether to select on trigger type
   TString fTriggerType;               //trigger type
 
-  Bool_t fSelectOnTriggerString;      //whether to select on trigger type with a formula
+  Bool_t  fSelectOnTriggerString;     //whether to select on trigger type with a formula
   TString fTriggerSelectionString;    //trigger selection formula
   TString fTriggerMaskPatternString;  //trigger mask placeholder for evaluation
 
   Bool_t fSelectOnMultiplicity;       //whether to select on multiplicity
-  Int_t fMultiplicityLow;             //lower bound on multiplicity
-  Int_t fMultiplicityHigh;            //higher bound on multiplicity
+  Int_t  fMultiplicityLow;            //lower bound on multiplicity
+  Int_t  fMultiplicityHigh;           //higher bound on multiplicity
 
 
   ClassDef(AliEveEventSelector, 2); 
index e00ef00..78d9f20 100644 (file)
@@ -33,18 +33,20 @@ ClassImp(AliEveEventSelectorWindow)
 //______________________________________________________________________________
 AliEveEventSelectorWindow::AliEveEventSelectorWindow(const TGWindow *p, UInt_t w, UInt_t h,
                                                      AliEveEventSelector* sel) :
-    TGMainFrame(p, w, h),
-    fPSelector(sel),
-    fPCanvas(NULL),
-    fPDrawFormula(NULL),
-    fPEntryFormula(NULL),
-    fPEntryLowerBound(NULL),
-    fPEntryHigherBound(NULL),
-    fPButtonTextDone(NULL),
-    fPComboBoxTrigger(NULL),
-    fPEntryTriggerSelection(NULL),
-    fPCheckTriggerSimple(NULL),
-    fPCheckTriggerString(NULL)
+  TGMainFrame(p, w, h),
+  fPSelector(sel),
+  fPCanvas(0),
+  fPDrawFormula(0),
+  fPEntryFormula(0),
+  fPEntryLowerBound(0),
+  fPEntryHigherBound(0),
+  fPButtonTextDone(0),
+  fPComboBoxTrigger(0),
+  fPEntryTriggerSelection(0),
+  fPCheckTriggerSimple(0),
+  fPCheckTriggerString(0),
+  fPEntryMultHigh(0),
+  fPEntryMultLow(0)
 {
   //ctor
 
index e523426..3f4b338 100644 (file)
@@ -56,18 +56,18 @@ private:
   AliEveEventSelector* fPSelector; //event selector
   TRootEmbeddedCanvas* fPCanvas;   //the canvas for histograms
 
-  TGTextEntry* fPDrawFormula;      //test draw input field
-  TGTextEntry* fPEntryFormula;     //selectin formula field
-  TGNumberEntry* fPEntryLowerBound; //lower boung for the formula
-  TGNumberEntry* fPEntryHigherBound; //higher bound for the formula
-  TGTextButton* fPButtonTextDone;    //done button for selection formula
+  TGTextEntry*   fPDrawFormula;           //test draw input field
+  TGTextEntry*   fPEntryFormula;          //selectin formula field
+  TGNumberEntry* fPEntryLowerBound;       //lower boung for the formula
+  TGNumberEntry* fPEntryHigherBound;      //higher bound for the formula
+  TGTextButton*  fPButtonTextDone;        //done button for selection formula
   
-  TGComboBox* fPComboBoxTrigger;     //trigger selection box
-  TGTextEntry* fPEntryTriggerSelection; //trigger selection formula entry field
-  TGCheckButton* fPCheckTriggerSimple;  //use simple trigger select
-  TGCheckButton* fPCheckTriggerString;  //use trigger select formula
-  TGNumberEntry* fPEntryMultHigh;       //lowest allowed multiplicity field
-  TGNumberEntry* fPEntryMultLow;        //higest allowed multiplicity field
+  TGComboBox*    fPComboBoxTrigger;       //trigger selection box
+  TGTextEntry*   fPEntryTriggerSelection; //trigger selection formula entry field
+  TGCheckButton* fPCheckTriggerSimple;    //use simple trigger select
+  TGCheckButton* fPCheckTriggerString;    //use trigger select formula
+  TGNumberEntry* fPEntryMultHigh;         //lowest allowed multiplicity field
+  TGNumberEntry* fPEntryMultLow;          //higest allowed multiplicity field
 
   AliEveEventSelectorWindow(const AliEveEventSelectorWindow&);
   AliEveEventSelectorWindow& operator=(const AliEveEventSelectorWindow&);