Changeset 991 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/26/01 10:11:30 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MClone.cc (modified) (7 diffs)
• MClone.h (modified) (1 diff)
• MPrint.cc (added)
• MPrint.h (added)
• MReadTree.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -32 +32 @@
 
 #pragma link C++ class MClone;
+#pragma link C++ class MPrint;
 
 #pragma link C++ class MReadTree;

trunk/MagicSoft/Mars/mbase/MClone.cc

@@ -69 +69 @@
     *fTitle = title ? title : "Task to clone a parameter container for later usage";
 
-    fClone        = NULL;
-    fParContainer = NULL;
+    fClone  = NULL;
+    fObject = NULL;
 }
 
@@ -77 +77 @@
 //  Constructor. Remembers the name to search for in the parameter list.
 //
-MClone::MClone(const char *par, const char *name, const char *title)
+MClone::MClone(const char *obj, const char *name, const char *title)
 {
     Init(name, title);
 
-    fParContainerName = par;
+    fObjName = obj;
 }
 
@@ -88 +88 @@
 //  Constructor. Remember the pointer of the object which has to be cloned.
 //
-MClone::MClone(const MParContainer *par, const char *name, const char *title)
+MClone::MClone(const TObject *obj, const char *name, const char *title)
 {
     Init(name, title);
 
-    fParContainer = par;
+    fObject = obj;
 }
 
@@ -114 +114 @@
     // The pointer is already given by the user.
     //
-    if (fParContainer)
+    if (fObject)
         return kTRUE;
 
@@ -120 +120 @@
     // Try to find the parameter container with the given name in the list
     //
-    fParContainer = (MParContainer*)pList->FindObject(fParContainerName);
-    if (fParContainer)
+    fObject = pList->FindObject(fObjName);
+    if (fObject)
         return kTRUE;
 
@@ -127 +127 @@
     // If it couldn't get found stop Eventloop
     //
-    *fLog << dbginf << fParContainerName << " not found... aborting." << endl;
+    *fLog << dbginf << fObjName << " not found... aborting." << endl;
     return kFALSE;
 }
@@ -165 +165 @@
     // Clone the given parameter container
     //
-    fClone = fParContainer->Clone();
+    fClone = fObject->Clone();
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MClone.h

@@ -15 +15 @@
 {
 private:
-    const MParContainer *fParContainer; // pointer to container which has to be cloned
-    TString fParContainerName;          // given name to search for in the parameterlist
+    const TObject *fObject; // pointer to container which has to be cloned
+    TString fObjName;       // given name to search for in the parameterlist
 
-    TObject* fClone;                    // pointer to the cloned object. deletion is handled by MClone
+    TObject* fClone;        // pointer to the cloned object. deletion is handled by MClone
 
     void Init(const char *name, const char *title);
 
 public:
-    MClone(const char *par,          const char *name=NULL, const char *title=NULL);
-    MClone(const MParContainer *par, const char *name=NULL, const char *title=NULL);
+    MClone(const char *obj,    const char *name=NULL, const char *title=NULL);
+    MClone(const TObject *obj, const char *name=NULL, const char *title=NULL);
     ~MClone();
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -83 +83 @@
 
     fVetoList = new TArrayC;
+
     //
     // open the input stream

trunk/MagicSoft/Mars/mbase/Makefile

@@ -47 +47 @@
            MArrayS.cc \
            MTime.cc \
-           MLog.cc \
            MHtml.cc \
            MClone.cc \
+           MPrint.cc \
+           MLog.cc \
            MLogManip.cc