Changeset 9302 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/07/09 20:40:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MContinue.cc (modified) (3 diffs)
• MFilter.cc (modified) (2 diffs)
• MLog.cc (modified) (4 diffs)
• MMath.cc (modified) (2 diffs)
• MParContainer.cc (modified) (1 diff)
• MParEmulated.cc (modified) (2 diffs)
• MStatusDisplay.cc (modified) (2 diffs)
• MTime.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -52 +52 @@
 
 #include "MF.h"
+#include "MString.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -105 +106 @@
 {
     fName  = name  ? name  : "MContinue";
-    fTitle = title ? title : "Task returning kCONTINUE";
+    fTitle = title ? title : "Task returning kCONTINUE (or any other return code)";
 
     SetFilter(f);
@@ -155 +156 @@
 
     if ((TString)GetFilter()->GetName()==fName)
-        GetFilter()->SetName(Form("MF:%s", fName.Data()));
+        GetFilter()->SetName(MString::Format("MF:%s", fName.Data()));
 
     if (!fTaskList->AddToListBefore(GetFilter(), this))

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -77 +77 @@
 #include "MLogManip.h"
 
+#include "MString.h"
+
 ClassImp(MFilter);
 
@@ -97 +99 @@
 TString MFilter::GetRule() const
 {
-    return Form("(%s)", ClassName()); //"<GetRule n/a for " + fName + ">";
+    return MString::Format("(%s)", ClassName()); //"<GetRule n/a for " + fName + ">";
 }
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.61 2008-06-16 14:58:27 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.62 2009-02-07 20:40:07 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -114 +114 @@
 #include "MArgs.h"
 #include "MTime.h"
+#include "MString.h"
 #include "MParContainer.h"
 
@@ -572 +573 @@
     TString f1 = arg.GetStringAndRemove("--log=", "");
     if (f1.IsNull() && arg.HasOnlyAndRemove("--log"))
-        f1 = Form("%s.log", arg.GetName());
+        f1 = MString::Format("%s.log", arg.GetName());
     if (!f1.IsNull())
     {
@@ -581 +582 @@
     TString f2 = arg.GetStringAndRemove("--html=", "");
     if (f2.IsNull() && arg.HasOnlyAndRemove("--html"))
-        f2 = Form("%s.html", arg.GetName());
+        f2 = MString::Format("%s.html", arg.GetName());
     if (!f2.IsNull())
     {

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.46 2009-01-24 10:57:46 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.47 2009-02-07 20:33:22 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -876 +876 @@
     }
 
-    const char *fmt = MString::Format("%%.%de", i);
-
-    v = MString::Format(fmt, v).Atof();
+    const TString fmt = MString::Format("%%.%de", i);
+
+    v = MString::Format(fmt.Data(), v).Atof();
     e = error.Atof();
 }

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -1103 +1103 @@
     for (int i=1; i<9; i++)
     {
-        const TString form = Form(id.Data(), i);
-        const TString res  = Form(form.Data(), num);
+        const TString form = MString::Format(id.Data(), i);
+        const TString res  = MString::Format(form.Data(), num);
 
         const TString str  = GetEnvValue2(env, prefix, res, "");

trunk/MagicSoft/Mars/mbase/MParEmulated.cc

@@ -50 +50 @@
 #include "MLogManip.h"
 
+#include "MString.h"
+
 ClassImp(MParEmulated);
 
@@ -158 +160 @@
     name.Prepend("Get");
 
-    TMethodCall *call = new TMethodCall(MParEmulated::Class(), name, proxy?Form("%p,%d", proxy, offset):Form("%d", offset));
+    TMethodCall *call = new TMethodCall(MParEmulated::Class(), name, proxy?MString::Format("%p,%d", proxy, offset):MString::Format("%d", offset));
     fgListMethodCall.Add(call);
     return call;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -485 +485 @@
 
     // Add copyright notice
-    l = new TGLabel(f, Form("(c) MARS Software Development, 2000-%d", TDatime().GetYear()));
+    l = new TGLabel(f, MString::Format("(c) MARS Software Development, 2000-%d", TDatime().GetYear()));
     fList->Add(l);
     f->AddFrame(l, layb);
@@ -2580 +2580 @@
 Int_t MStatusDisplay::InitWriteDisplay(Int_t num, TString &name, const TString &ext)
 {
-    SetStatusLine1(Form("Writing %s file...",ext.Data()));
+    SetStatusLine1(MString::Format("Writing %s file...",ext.Data()));
     SetStatusLine2("Please be patient!");
 

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -84 +84 @@
 
 #include "MAstro.h"
+#include "MString.h"
 
 ClassImp(MTime);
@@ -708 +709 @@
     GetTime(h, m, s, ms);
 
-    return TString(Form("%02d.%02d.%04d %02d:%02d:%02d.%03d", d, mon, y, h, m, s, ms));
+    return MString::Format("%02d.%02d.%04d %02d:%02d:%02d.%03d", d, mon, y, h, m, s, ms);
 }
 
@@ -883 +884 @@
 
     *fLog << all << GetDescriptor() << ": ";
-    *fLog << GetString() << Form(" (+%dns)", fNanoSec) << endl;
+    *fLog << GetString() << MString::Format(" (+%dns)", fNanoSec) << endl;
 }