Root6-enabled version

[u/mrichter/AliRoot.git] / MONITOR / AliQAHistNavigator.cxx

diff --git a/MONITOR/AliQAHistNavigator.cxx b/MONITOR/AliQAHistNavigator.cxx
index e74aa09a7c27551041b572831d206320c96c6150..1a76a7cbbde06aa457912509da79cdf64d0f2073 100644 (file)
--- a/MONITOR/AliQAHistNavigator.cxx
+++ b/MONITOR/AliQAHistNavigator.cxx
@@ -198,9 +198,7 @@ void AliQAHistNavigator::SetExpertMode(Bool_t mode)
     //sets the expert mode
     Bool_t oldmode = fExpertMode;
     fExpertMode = mode;
-    TList* itemList = GetItemList();
-    
-    if (fExpertMode!=oldmode && itemList) fPCurrItem = (AliQADirListItem*)itemList->First();
+    if (fExpertMode!=oldmode) fPCurrItem = (AliQADirListItem*)GetItemList()->First();
     
 }
 
@@ -330,11 +328,10 @@ Bool_t AliQAHistNavigator::SetItem( Int_t hist )
 TList* AliQAHistNavigator::GetItemList()
 {
     //returns the current list of histograms, if none, returns empty list
-    TList* itemlist=0;
+    TList* itemlist=NULL;
     if (fExpertMode)
     {
-        AliQADirList* expertlist = 0;
-        if(fPCurrLevel) expertlist = (AliQADirList*)fPCurrLevel->GetDirs()->FindObject(fExpertDirName);
+        AliQADirList* expertlist = (AliQADirList*)fPCurrLevel->GetDirs()->FindObject(fExpertDirName);
         if (expertlist) itemlist = expertlist->GetItems();
         else
         {
@@ -345,7 +342,7 @@ TList* AliQAHistNavigator::GetItemList()
         }
     } else
     {
-        if(fPCurrLevel) itemlist = fPCurrLevel->GetItems();
+        itemlist = fPCurrLevel->GetItems();
     }
     return itemlist;
 }
@@ -381,7 +378,7 @@ TString AliQAHistNavigator::GetFileName()
 TString AliQAHistNavigator::GetDirName()
 {
     //get the name of dir containing current item
-    if (!fPCurrItem || !fPCurrItem->GetParent()) return "";
+    if (!fPCurrItem) return "";
     AliQADirList* d=(AliQADirList*)fPCurrItem->GetParent();
     TString path;
     do