Use the new TPad shortcuts

couet · linev · commit d0a3d7dc102d · 2024-06-13T10:48:28.000+02:00
diff --git a/graf3d/eve/src/TEveGeoNode.cxx b/graf3d/eve/src/TEveGeoNode.cxx
@@ -337,7 +337,7 @@ TEveGeoShapeExtract* TEveGeoNode::DumpShapeTree(TEveGeoNode*         geon,
       {
          TEvePad pad;
          TEvePadHolder gpad(kFALSE, &pad);
-         pad.GetListOfPrimitives()->Add(tshape);
+         pad.Add(tshape);
          TGLScenePad scene_pad(&pad);
          pad.SetViewer3D(&scene_pad);
 
diff --git a/graf3d/eve/src/TEveGeoPolyShape.cxx b/graf3d/eve/src/TEveGeoPolyShape.cxx
@@ -51,7 +51,7 @@ TEveGeoPolyShape* TEveGeoPolyShape::Construct(TGeoCompositeShape *cshape, Int_t
    TEvePad       pad;
    TEvePadHolder gpad(kFALSE, &pad);
    TGLScenePad   scene_pad(&pad);
-   pad.GetListOfPrimitives()->Add(cshape);
+   pad.Add(cshape);
    pad.SetViewer3D(&scene_pad);
 
    TEveGeoManagerHolder gmgr(TEveGeoShape::GetGeoMangeur(), n_seg);
diff --git a/graf3d/eve/src/TEveScene.cxx b/graf3d/eve/src/TEveScene.cxx
@@ -47,7 +47,7 @@ TEveScene::TEveScene(const char* n, const char* t) :
    fHierarchical (kFALSE)
 {
    fPad = new TEvePad;
-   fPad->GetListOfPrimitives()->Add(this);
+   fPad->Add(this);
    fGLScene = new TGLScenePad(fPad);
    fGLScene->SetName(n);
    fGLScene->SetAutoDestruct(kFALSE);
@@ -66,7 +66,7 @@ TEveScene::TEveScene(TGLScenePad* gl_scene, const char* n, const char* t) :
    fHierarchical (kFALSE)
 {
    fPad = new TEvePad;
-   fPad->GetListOfPrimitives()->Add(this);
+   fPad->Add(this);
    fGLScene->SetPad(fPad);
    fGLScene->SetName(n);
    fGLScene->SetAutoDestruct(kFALSE);
diff --git a/gui/browsable/src/RNTupleDraw6Provider.cxx b/gui/browsable/src/RNTupleDraw6Provider.cxx
@@ -33,7 +33,7 @@ class RNTupleDraw6Provider : public RFieldProvider {
          auto h1 = DrawField(dynamic_cast<RFieldHolder*> (obj.get()));
          if (!h1) return false;
 
-         pad->GetListOfPrimitives()->Add(h1, opt.c_str());
+         pad->Add(h1, opt.c_str());
 
          return true;
       });
diff --git a/hist/hist/src/TGraphTime.cxx b/hist/hist/src/TGraphTime.cxx
@@ -151,9 +151,9 @@ void TGraphTime::Paint(Option_t *option)
    for (Int_t s=0;s<fNsteps;s++) {
       list = (TList*)fSteps->UncheckedAt(s);
       if (list) {
-         gPad->GetListOfPrimitives()->Remove(frame);
+         gPad->Remove(frame);
          gPad->GetListOfPrimitives()->Clear();
-         if (frame) gPad->GetListOfPrimitives()->Add(frame);
+         if (frame) gPad->Add(frame);
          lnk = list->FirstLink();
          while(lnk) {
             TObject *obj = lnk->GetObject();
@@ -180,9 +180,9 @@ void TGraphTime::SaveAnimatedGif(const char *filename) const
    for (Int_t s=0;s<fNsteps;s++) {
       list = (TList*)fSteps->UncheckedAt(s);
       if (list) {
-         gPad->GetListOfPrimitives()->Remove(frame);
+         gPad->Remove(frame);
          gPad->GetListOfPrimitives()->Clear();
-         if (frame) gPad->GetListOfPrimitives()->Add(frame);
+         if (frame) gPad->Add(frame);
          lnk = list->FirstLink();
          while(lnk) {
             TObject *obj = lnk->GetObject();
diff --git a/hist/hist/src/TH1.cxx b/hist/hist/src/TH1.cxx
@@ -3090,7 +3090,7 @@ void TH1::Draw(Option_t *option)
       } else {
          //the following statement is necessary in case one attempts to draw
          //a temporary histogram already in the current pad
-         if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);
+         if (TestBit(kCanDelete)) gPad->Remove(this);
          gPad->Clear();
       }
       gPad->IncrementPaletteColor(1, opt1);
diff --git a/hist/hist/src/THStack.cxx b/hist/hist/src/THStack.cxx
@@ -459,7 +459,7 @@ void THStack::Draw(Option_t *option)
       if (!opt.Contains("same")) {
          //the following statement is necessary in case one attempts to draw
          //a temporary histogram already in the current pad
-         if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);
+         if (TestBit(kCanDelete)) gPad->Remove(this);
          gPad->Clear();
       }
    }
diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
@@ -6785,7 +6785,7 @@ void THistPainter::PaintFrame()
    if (Hoption.Lego || Hoption.Surf || Hoption.Tri ||
        Hoption.Contour == 14 || Hoption.Error >= 100) {
       TObject *frame = gPad->FindObject("TFrame");
-      if (frame) gPad->GetListOfPrimitives()->Remove(frame);
+      if (frame) gPad->Remove(frame);
       return;
    }
 
diff --git a/test/Tetris.cxx b/test/Tetris.cxx
@@ -45,7 +45,7 @@ TetrisBox::TetrisBox(Int_t x, Int_t y, UInt_t type, TPad* pad) :
    //-------  append box to pad
    SetBit(kMustCleanup);
    SetBit(kCanDelete);
-   pad->GetListOfPrimitives()->Add(this);
+   pad->Add(this);
    SetXY(x,y);
 }
 
@@ -795,10 +795,10 @@ InfoPad::InfoPad(const char* title, Float_t xlow, Float_t ylow, Float_t xup, Flo
    TText *text = new TText(xlow,yup,title);   // draw title of the information pad
    text->SetTextSize(0.45*(yup-ylow));
    text->SetY(yup+0.2*text->GetTextSize());
-   fMother->GetListOfPrimitives()->Add(text);
+   fMother->Add(text);
 
    text = new TText(0.5,0.5,"0");          // this text used to display fValue
-   GetListOfPrimitives()->Add(text);
+   Add(text);
 
    fValue = 0;
    Modified(kTRUE);
@@ -910,7 +910,7 @@ UpdateLevelTimer::UpdateLevelTimer(ULong_t time) : TTimer(time,kTRUE)
    // Update level timer constructor
 
    SetBit(kCanDelete);   // delete this when gTetris is deleted
-   gTetris->GetListOfPrimitives()->Add(this);
+   gTetris->Add(this);
 }
 
 Bool_t UpdateLevelTimer::Notify()
diff --git a/tree/treeplayer/src/TTreePerfStats.cxx b/tree/treeplayer/src/TTreePerfStats.cxx
@@ -258,7 +258,7 @@ void TTreePerfStats::Draw(Option_t *option)
       if (!gPad->IsEditable()) gROOT->MakeDefCanvas();
       //the following statement is necessary in case one attempts to draw
       //a temporary histogram already in the current pad
-      if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);
+      if (TestBit(kCanDelete)) gPad->Remove(this);
    } else {
       gROOT->MakeDefCanvas();
    }
diff --git a/tutorials/eve7/lego.C b/tutorials/eve7/lego.C
@@ -62,7 +62,7 @@ void lego()
          h->Fill(0.1*r.Gaus() + 2, 0.1*r.Gaus());
       }
       // h->Draw("LEGO2");
-      p->GetListOfPrimitives()->Add(h, "LEGO2");
+      p->Add(h, "LEGO2");
       p->Modified(kTRUE);
       */
 
@@ -85,14 +85,14 @@ void lego()
       s->Add(ecalHist);
       hcalHist->SetFillColor(kBlue);
       s->Add(hcalHist);
-      p->GetListOfPrimitives()->Add(s);
+      p->Add(s);
 
       TGraph2D *line = new TGraph2D(200);
       for (int i = 0; i < 200; ++i)
          line->SetPoint(i, std::cos(i*0.1), std::sin(i*0.1), i*0.25);
       line->SetLineWidth(5);
       line->SetLineColor(kCyan - 2);
-      p->GetListOfPrimitives()->Add(line, "LINE");
+      p->Add(line, "LINE");
 
       p->Modified(kTRUE);
 

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ TEveGeoShapeExtract* TEveGeoNode::DumpShapeTree(TEveGeoNode* geon,`
`337`	`337`	`{`
`338`	`338`	`TEvePad pad;`
`339`	`339`	`TEvePadHolder gpad(kFALSE, &pad);`
`340`		`- pad.GetListOfPrimitives()->Add(tshape);`
	`340`	`+ pad.Add(tshape);`
`341`	`341`	`TGLScenePad scene_pad(&pad);`
`342`	`342`	`pad.SetViewer3D(&scene_pad);`
`343`	`343`
Original file line number	Diff line number	Diff line change
`@@ -3090,7 +3090,7 @@ void TH1::Draw(Option_t *option)`
`3090`	`3090`	`} else {`
`3091`	`3091`	`//the following statement is necessary in case one attempts to draw`
`3092`	`3092`	`//a temporary histogram already in the current pad`
`3093`		`- if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);`
	`3093`	`+ if (TestBit(kCanDelete)) gPad->Remove(this);`
`3094`	`3094`	`gPad->Clear();`
`3095`	`3095`	`}`
`3096`	`3096`	`gPad->IncrementPaletteColor(1, opt1);`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ void THStack::Draw(Option_t *option)`
`459`	`459`	`if (!opt.Contains("same")) {`
`460`	`460`	`//the following statement is necessary in case one attempts to draw`
`461`	`461`	`//a temporary histogram already in the current pad`
`462`		`- if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);`
	`462`	`+ if (TestBit(kCanDelete)) gPad->Remove(this);`
`463`	`463`	`gPad->Clear();`
`464`	`464`	`}`
`465`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6785,7 +6785,7 @@ void THistPainter::PaintFrame()`
`6785`	`6785`	`if (Hoption.Lego \|\| Hoption.Surf \|\| Hoption.Tri \|\|`
`6786`	`6786`	`Hoption.Contour == 14 \|\| Hoption.Error >= 100) {`
`6787`	`6787`	`TObject *frame = gPad->FindObject("TFrame");`
`6788`		`- if (frame) gPad->GetListOfPrimitives()->Remove(frame);`
	`6788`	`+ if (frame) gPad->Remove(frame);`
`6789`	`6789`	`return;`
`6790`	`6790`	`}`
`6791`	`6791`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ void TTreePerfStats::Draw(Option_t *option)`
`258`	`258`	`if (!gPad->IsEditable()) gROOT->MakeDefCanvas();`
`259`	`259`	`//the following statement is necessary in case one attempts to draw`
`260`	`260`	`//a temporary histogram already in the current pad`
`261`		`- if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);`
	`261`	`+ if (TestBit(kCanDelete)) gPad->Remove(this);`
`262`	`262`	`} else {`
`263`	`263`	`gROOT->MakeDefCanvas();`
`264`	`264`	`}`