Changeset 8930 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/09/08 13:36:25 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MArgs.cc (modified) (17 diffs)
• MArgs.h (modified) (2 diffs)
• MObjLookup.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 7/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2003-2004
+!   Copyright: MAGIC Software Development, 2003-2008
 !
 !
@@ -62 +62 @@
 MArgs::MArgs(int argc, char **argv, Bool_t root) : fArgc(argc)
 {
+    TString cmdline;
     // FIXME: argv has no const-qualifier to be idetical with
     //        TApplication.
-    fName = argv[0];
-
-    fArgv = new TList;
-    fArgv->SetOwner();
+    fName  = argv[0];
+    fTitle = argv[0];
+
+    fArgv.SetOwner();
 
     for (int i=1; i<argc; i++)
     {
-        MArgsEntry &o = *new MArgsEntry(argv[i]);
-        fArgv->Add(&o);
+        fTitle += " ";
+        fTitle += argv[i];
+        fArgv.Add(new MArgsEntry(argv[i]));
     }
 
@@ -79 +81 @@
 
     HasOnlyAndRemove("-b");
-}
-
-// --------------------------------------------------------------------------
-//
-// Deletes fArgv.
-//
-MArgs::~MArgs()
-{
-    delete fArgv;
 }
 
@@ -95 +88 @@
 // Using 'options' as option only 'options' are printed.
 // Using 'arguments' as option only 'arguments' are printed.
+// Using 'cmdline' as option the command line is printed instead of
+//       just the program name
 //
 void MArgs::Print(const Option_t *o) const
 {
-    gLog << all << underline << fName << ":" << endl;
-
-    const TString str(o);
+    TString str(o);
+
+    gLog << all << underline;
+    if (str.Contains("cmdline"))
+        gLog << fTitle << endl;
+    else
+        gLog << fName << ":" << endl;
+
+    str.ReplaceAll("cmdline", "");
+    str.ReplaceAll(" ", "");
 
     if (!str.CompareTo("options", TString::kIgnoreCase))
     {
-        TIter Next(fArgv);
+        TIter Next(&fArgv);
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
@@ -114 +116 @@
     if (!str.CompareTo("arguments", TString::kIgnoreCase))
     {
-        TIter Next(fArgv);
+        TIter Next(&fArgv);
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
@@ -122 +124 @@
     }
 
-    fArgv->Print();
+    fArgv.Print();
 }
 
@@ -156 +158 @@
 TString MArgs::GetString(const TString name) const
 {
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -200 +202 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -206 +208 @@
         {
             TString str = s->Data()+s->Index(name)+name.Length();
-            delete fArgv->Remove(dynamic_cast<TObject*>(s));
+            delete fArgv.Remove(dynamic_cast<TObject*>(s));
             return str;
         }
@@ -281 +283 @@
     Int_t num = 0;
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -303 +305 @@
     Int_t num = 0;
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -320 +322 @@
     Int_t num = 0;
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -335 +337 @@
 Int_t MArgs::GetNumEntries() const
 {
-    return fArgv->GetSize();
+    return fArgv.GetSize();
 }
 
@@ -349 +351 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -369 +371 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -391 +393 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -417 +419 @@
     Bool_t rc = kFALSE;
 
-    TIter Next(fArgv);
+    TIter Next(&fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
         if (*s==name)
         {
-            delete fArgv->Remove(dynamic_cast<TObject*>(s));
+            delete fArgv.Remove(dynamic_cast<TObject*>(s));
             rc = kTRUE;
         }

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -27 +27 @@
 {
 private:
-    Int_t  fArgc;
-    TList *fArgv; //->
+    Int_t fArgc; //!
+    TList fArgv; //!
 
 public:
     MArgs(int argc, char **argv, Bool_t root=kFALSE);
-    ~MArgs();
 
+    // TObject
     void Print(const Option_t *o="") const;
 
@@ -39 +39 @@
     // FIXME: Add default option
 
+    // MArgs
     Int_t    GetInt(const TString name) const;
     Double_t GetFloat(const TString name) const;

trunk/MagicSoft/Mars/mbase/MObjLookup.cc

@@ -49 +49 @@
     while (iter.Next(key, value))
     {
-        TObject *o = (TObject*)value;
+        TObject *o = reinterpret_cast<TObject*>(value);
         if (o->TestBit(kCanDelete) || TestBit(kIsOwner))
             delete o;
@@ -88 +88 @@
 TObject *MObjLookup::GetObj(Long_t key) const
 {
-    TObject *o = (TObject*)const_cast<TExMap&>(fMap).GetValue(key);
+    TObject *o = reinterpret_cast<TObject*>(const_cast<TExMap&>(fMap).GetValue(key));
     return o ? o : fDefault;
 }