Skip to content

Commit a53421f

Browse files
committed
Use TString::Format in TRootCanvas
Use of old Form() involves global buffer which is not optimal
1 parent ead88b7 commit a53421f

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

gui/gui/src/TRootCanvas.cxx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,12 @@ void TRootCanvas::CreateCanvas(const char *name)
379379

380380
// Create menus
381381
fFileSaveMenu = new TGPopupMenu(fClient->GetDefaultRoot());
382-
fFileSaveMenu->AddEntry(Form("%s.&ps", name), kFileSaveAsPS);
383-
fFileSaveMenu->AddEntry(Form("%s.&eps", name), kFileSaveAsEPS);
384-
fFileSaveMenu->AddEntry(Form("%s.p&df", name), kFileSaveAsPDF);
385-
fFileSaveMenu->AddEntry(Form("%s.&svg", name), kFileSaveAsSVG);
386-
fFileSaveMenu->AddEntry(Form("%s.&tex", name), kFileSaveAsTEX);
387-
fFileSaveMenu->AddEntry(Form("%s.&gif", name), kFileSaveAsGIF);
382+
fFileSaveMenu->AddEntry(TString::Format("%s.&ps", name), kFileSaveAsPS);
383+
fFileSaveMenu->AddEntry(TString::Format("%s.&eps", name), kFileSaveAsEPS);
384+
fFileSaveMenu->AddEntry(TString::Format("%s.p&df", name), kFileSaveAsPDF);
385+
fFileSaveMenu->AddEntry(TString::Format("%s.&svg", name), kFileSaveAsSVG);
386+
fFileSaveMenu->AddEntry(TString::Format("%s.&tex", name), kFileSaveAsTEX);
387+
fFileSaveMenu->AddEntry(TString::Format("%s.&gif", name), kFileSaveAsGIF);
388388

389389
static Int_t img = 0;
390390

@@ -400,12 +400,12 @@ void TRootCanvas::CreateCanvas(const char *name)
400400
gErrorIgnoreLevel = sav;
401401
}
402402
if (img > 0) {
403-
fFileSaveMenu->AddEntry(Form("%s.&jpg",name), kFileSaveAsJPG);
404-
fFileSaveMenu->AddEntry(Form("%s.&png",name), kFileSaveAsPNG);
403+
fFileSaveMenu->AddEntry(TString::Format("%s.&jpg",name), kFileSaveAsJPG);
404+
fFileSaveMenu->AddEntry(TString::Format("%s.&png",name), kFileSaveAsPNG);
405405
}
406406

407-
fFileSaveMenu->AddEntry(Form("%s.&C", name), kFileSaveAsC);
408-
fFileSaveMenu->AddEntry(Form("%s.&root",name), kFileSaveAsRoot);
407+
fFileSaveMenu->AddEntry(TString::Format("%s.&C", name), kFileSaveAsC);
408+
fFileSaveMenu->AddEntry(TString::Format("%s.&root",name), kFileSaveAsRoot);
409409

410410
fFileMenu = new TGPopupMenu(fClient->GetDefaultRoot());
411411
fFileMenu->AddEntry("&New Canvas", kFileNewCanvas);
@@ -1380,7 +1380,7 @@ void TRootCanvas::SetWindowTitle(const char *title)
13801380
{
13811381
SetWindowName(title);
13821382
SetIconName(title);
1383-
fToolDock->SetWindowName(Form("ToolBar: %s", title));
1383+
fToolDock->SetWindowName(TString::Format("ToolBar: %s", title));
13841384
}
13851385

13861386
////////////////////////////////////////////////////////////////////////////////
@@ -1668,7 +1668,7 @@ void TRootCanvas::ShowToolBar(Bool_t show)
16681668
}
16691669
fToolDock->MapSubwindows();
16701670
fToolDock->Layout();
1671-
fToolDock->SetWindowName(Form("ToolBar: %s", GetWindowName()));
1671+
fToolDock->SetWindowName(TString::Format("ToolBar: %s", GetWindowName()));
16721672
fToolDock->Connect("Docked()", "TRootCanvas", this, "AdjustSize()");
16731673
fToolDock->Connect("Undocked()", "TRootCanvas", this, "AdjustSize()");
16741674
}
@@ -2040,7 +2040,7 @@ Bool_t TRootCanvas::HandleDNDDrop(TDNDData *data)
20402040
if (!obj) return kTRUE;
20412041
gPad->Clear();
20422042
if (obj->InheritsFrom("TKey")) {
2043-
TObject *object = (TObject *)gROOT->ProcessLine(Form("((TKey *)0x%zx)->ReadObj();", (size_t)obj));
2043+
TObject *object = (TObject *)gROOT->ProcessLine(TString::Format("((TKey *)0x%zx)->ReadObj();", (size_t)obj));
20442044
if (!object) return kTRUE;
20452045
if (object->InheritsFrom("TGraph"))
20462046
object->Draw("ALP");

0 commit comments

Comments
 (0)