Changeset 651 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/23/01 16:49:26 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParList.cc (modified) (3 diffs)
• MParList.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -23 +23 @@
 ClassImp(MParList)
 
-MParList::MParList() : fNext(NULL)
+MParList::MParList()
 {
   //
@@ -102 +102 @@
 }
 
-TObject *MParList::FindObject(const char *name) const
+MParContainer *MParList::FindObject(const char *name) const
 {
     //
@@ -108 +108 @@
     //  'name' is the name of the object you are searching for.
     //
-    return (TObject*)fContainer.FindObject(name);
+    return (MParContainer*)fContainer.FindObject(name);
 }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -26 +26 @@
 {
 private:
-    TIter *fNext;               //!
     TOrdCollection fContainer;  // Collection of Parameter and Data Containers
 
@@ -35 +34 @@
     ~MParList()
     {
-        if (fNext)
-            delete fNext;
     }
 
@@ -43 +40 @@
     void SetLogStream(MLog *log);
 
-    TObject *FindObject(const char *name) const;
-
-    void Reset()
-    {
-        fNext = new TIter(&fContainer);
-    }
-
-    MParContainer *Next()
-    {
-        return (MParContainer*)(*fNext)();
-    }
+    MParContainer *FindObject(const char *name) const;
 
     void Print(Option_t *t = NULL);