Changeset 2275 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/13/03 19:01:14 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MArgs.cc (modified) (10 diffs)
• MArgs.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -44 +44 @@
 }
 
-MArgs::MArgs(int argc, const char **argv) : fArgc(argc), fArgv()
+MArgs::MArgs(int argc, const char **argv) : fArgc(argc)
 {
     fName = argv[0];
 
-    fArgv.SetOwner();
+    fArgv = new TList;
+    fArgv->SetOwner();
 
     for (int i=1; i<argc; i++)
@@ -54 +55 @@
         MArgsEntry &o = *new MArgsEntry(argv[i]);
         dynamic_cast<TString&>(o) = o.Strip(TString::kBoth);
-        fArgv.Add(&o);
+        fArgv->Add(&o);
     }
+}
+
+MArgs::~MArgs()
+{
+    delete fArgv;
 }
 
@@ -61 +67 @@
 {
     gLog << all << underline << fName << ":" << endl;
-    fArgv.Print();
+    fArgv->Print();
 }
 
@@ -76 +82 @@
 TString MArgs::GetString(const TString name) const
 {
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -98 +104 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -104 +110 @@
         {
             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;
         }
@@ -124 +130 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -142 +148 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -155 +161 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
@@ -167 +173 @@
     const TString name = n.Strip(TString::kBoth);
 
-    TIter Next(&fArgv);
+    TIter Next(fArgv);
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -27 +27 @@
 {
 private:
-    Int_t fArgc;
-    TList fArgv;
+    Int_t  fArgc;
+    TList *fArgv; //->
 
 public:
     MArgs(int argc, const char **argv);
+    ~MArgs();
 
     void Print(const Option_t *o="") const;