Merge remote-tracking branch 'origin/master' into mergingFlat

[u/mrichter/AliRoot.git] / EVE / EveBase / AliEveTrackCounterEditor.cxx

diff --git a/EVE/EveBase/AliEveTrackCounterEditor.cxx b/EVE/EveBase/AliEveTrackCounterEditor.cxx
index f6cc9e06fa495e3e77ab63187ba8ae34ca508586..2803b6672fd0c81c17995480af1a44bd540a2fe4 100644 (file)
--- a/EVE/EveBase/AliEveTrackCounterEditor.cxx
+++ b/EVE/EveBase/AliEveTrackCounterEditor.cxx
@@ -225,9 +225,10 @@ AliEveTrackCounterEditor::~AliEveTrackCounterEditor()
 
 void AliEveTrackCounterEditor::UpdateModel()
 {
-  if (fGedEditor && fM && fGedEditor->GetModel() == fM->GetEditorObject("TEveElement::GetEditorObject"))
+  TEveException e;
+  if (fGedEditor && fM && fGedEditor->GetModel() == fM->GetEditorObject(e))
   {
-    SetModel(fM->GetEditorObject("TEveElement::GetEditorObject"));
+    SetModel(fM->GetEditorObject(e));
   }
 }
 
@@ -236,7 +237,7 @@ void AliEveTrackCounterEditor::SetModel(TObject* obj)
 {
    // Set model object.
 
-   fM = dynamic_cast<AliEveTrackCounter*>(obj);
+   fM = static_cast<AliEveTrackCounter*>(obj);
 
    if (fM->GetActive())
    {
@@ -272,7 +273,7 @@ void AliEveTrackCounterEditor::DoActivate()
 
    char fname[200];
    TDatime dat;
-   sprintf(fname, "ScanSummary.%i.%i.txt", dat.GetDate(), dat.GetTime());
+   snprintf(fname, 200,"ScanSummary.%i.%i.txt", dat.GetDate(), dat.GetTime());
    fScanSummaryFile = new ofstream(fname);
    (*fScanSummaryFile) << "Scan summary" << std::endl;
    (*fScanSummaryFile) << "Scan started at " << dat.GetDate() << " " << dat.GetTime() << std::endl;