Changeset 4766 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/27/04 16:57:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MArgs.cc (modified) (4 diffs)
• MArgs.h (modified) (1 diff)
• MStatusDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -57 +57 @@
 //  fArgv: A TList containing all other command line arguments
 //
-MArgs::MArgs(int argc, char **argv) : fArgc(argc)
+//  If root==kFALSE all root commandline options are deleted from
+//  the list, namely: -b
+//
+MArgs::MArgs(int argc, char **argv, Bool_t root) : fArgc(argc)
 {
     // FIXME: argv has no const-qualifier to be idetical with
@@ -72 +75 @@
         fArgv->Add(&o);
     }
+
+    if (root)
+        return;
+
+    HasOnlyAndRemove("-b");
 }
 
@@ -408 +416 @@
     const TString name = n.Strip(TString::kBoth);
 
+    Bool_t rc = kFALSE;
+
     TIter Next(fArgv);
     TString *s = NULL;
@@ -414 +424 @@
         {
             delete fArgv->Remove(dynamic_cast<TObject*>(s));
-            return kTRUE;
+            rc = kTRUE;
         }
 
-    return kFALSE;
-}
+    return rc;
+}

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -27 +27 @@
 
 public:
-    MArgs(int argc, char **argv);
+    MArgs(int argc, char **argv, Bool_t root=kFALSE);
     ~MArgs();
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1131 +1131 @@
 void MStatusDisplay::Reset()
 {
+    if (gROOT->IsBatch())
+    {
+        fBatch->Delete();
+        return;
+    }
+
     for (int i=fTab->GetNumberOfTabs()-1; i>0; i--)
         RemoveTab(i);