Changeset 19720

Timestamp:

10/05/19 16:54:54 (5 years ago)

Author:

tbretz

Message:

Added a constructor which allows to instantiate MDIrIter with just one argument

Location:

trunk/Mars/mbase

Files:

• MDirIter.cc (modified) (2 diffs)
• MDirIter.h (modified) (2 diffs)

trunk/Mars/mbase/MDirIter.cc

@@ -139 +139 @@
 
     // Create an iterator to iterate over all entries in the directory
-    MDirIter NextD(dir);
+    MDirIter NextD;
+    NextD.AddDirectory(dir);
 
     TString c;
@@ -159 +160 @@
 // Add a single file to the iterator
 //
-Int_t MDirIter::AddFile(const char *name)
+Int_t MDirIter::AddFile(const char *name, Int_t rec)
 {
     return AddDirectory(gSystem->DirName(name), gSystem->BaseName(name));

trunk/Mars/mbase/MDirIter.h

@@ -38 +38 @@
             AddDirectory(o->GetName(), o->GetTitle());
     }
-    MDirIter(const char *dir, const char *filter="", Int_t rec=0) : fNext(&fList), fDirPtr(NULL)
+    MDirIter(const char *dir, const char *filter, Int_t rec=0) : fNext(&fList), fDirPtr(NULL)
     {
         fList.SetOwner();
         AddDirectory(dir, filter, rec);
+    }
+    MDirIter(const char *dir, Int_t rec=0) : fNext(&fList), fDirPtr(NULL)
+    {
+        fList.SetOwner();
+        AddFile(dir, rec);
     }
     ~MDirIter()
@@ -52 +57 @@
 
     Int_t AddDirectory(const char *dir, const char *filter="", Int_t recursive=0);
-    Int_t AddFile(const char *name);
+    Int_t AddFile(const char *name, Int_t rec=0);
     void  Add(const MDirIter &iter);
     void  Reset();