chore: Use value semantics in FairParAsciiFileIo

Author: ChristianTackeGSI

fairroot/parbase/FairParAsciiFileIo.cxx

@@ -34,19 +34,6 @@
 using std::cerr;
 using std::cout;
 using std::endl;
-using std::filebuf;
-using std::ios;
-
-FairParAsciiFileIo::FairParAsciiFileIo()
-    : FairParIo()
-    , file(nullptr)
-{}
-
-FairParAsciiFileIo::~FairParAsciiFileIo()
-{
-    // default destructor closes an open file and deletes list of I/Os
-    close();
-}
 
 void FairParAsciiFileIo::ActivateSelf()
 {
@@ -68,15 +55,13 @@ Bool_t FairParAsciiFileIo::open(const Text_t* fname, const Text_t* status)
              << "\n  writing state : out\n   reading state : in  \nopen  aborted \n";
         return kFALSE;
     }
-    file = new std::fstream();
     if (strcmp(status, "in") == 0) {
-        file->open(fname, ios::in);
+        file.open(fname, std::ios::in);
     };
     if (strcmp(status, "out") == 0) {
-        file->open(fname, ios::out);
+        file.open(fname, std::ios::out);
     };
-    filebuf* buf = file->rdbuf();
-    if (file && (buf->is_open() == 1)) {
+    if (file.is_open()) {
         filename = fname;
         ActivateSelf();
         FairRuntimeDb::instance()->activateParIo(this);
@@ -129,12 +114,7 @@ void FairParAsciiFileIo::MergeFiles(const char* fname, const TList* fnamelist)
 
 void FairParAsciiFileIo::close()
 {
-    // closes the file and deletes the detector I/Os
-    if (file) {
-        file->close();
-        delete file;
-        file = 0;
-    }
+    file.close();
     FairParIo::close();
 }
 
@@ -148,9 +128,3 @@ void FairParAsciiFileIo::print()
         cout << "No file open\n";
     }
 }
-
-std::fstream* FairParAsciiFileIo::getFile()
-{
-    // returns the file pointer
-    return file;
-}

fairroot/parbase/FairParAsciiFileIo.h

@@ -13,20 +13,17 @@
 #include <Rtypes.h>   // for Bool_t, Text_t, etc
 #include <fstream>    // for fstream, etc
 
-class TList;
-
 class FairParAsciiFileIo : public FairParIo
 {
-  protected:
-    std::fstream* file;   // pointer to a file
-
   public:
-    FairParAsciiFileIo();
+    FairParAsciiFileIo() = default;
+    FairParAsciiFileIo(const FairParAsciiFileIo&) = delete;
+    FairParAsciiFileIo& operator=(const FairParAsciiFileIo&) = delete;
 
     /**
      * default destructor closes an open file and deletes list of I/Os
      */
-    ~FairParAsciiFileIo() override;
+    ~FairParAsciiFileIo() override = default;
 
     /**
      * \brief Opens file
@@ -64,23 +61,15 @@ class FairParAsciiFileIo : public FairParIo
     void close() override;
 
     // returns kTRUE if file is open
-    Bool_t check() override
-    {
-        if (file) {
-            return (file->rdbuf()->is_open() == 1);
-        } else {
-            return kFALSE;
-        }
-    }
+    Bool_t check() override { return file.is_open(); }
 
     // prints information about the file and the detector I/Os
     void print() override;
 
-    std::fstream* getFile();
+    std::fstream* getFile() { return &file; }
 
   private:
-    FairParAsciiFileIo(const FairParAsciiFileIo&);
-    FairParAsciiFileIo& operator=(const FairParAsciiFileIo&);
+    std::fstream file{};
     void ActivateSelf();
 
     ClassDefOverride(FairParAsciiFileIo, 0);   // Parameter I/O from ASCII files

fairroot/parbase/FairParIo.h

@@ -25,6 +25,8 @@ class FairParIo : public TObject
 
   public:
     FairParIo();
+    FairParIo(const FairParIo&) = delete;
+    FairParIo& operator=(const FairParIo&) = delete;
     ~FairParIo() override;
     virtual FairDetParIo* getDetParIo(const Text_t*);
     virtual void setDetParIo(FairDetParIo*);
@@ -57,10 +59,6 @@ class FairParIo : public TObject
     void setAutoWritable(Bool_t f = kTRUE) { autoWritable = f; }
     Bool_t isAutoWritable() const { return autoWritable; }
 
-  private:
-    FairParIo(const FairParIo&);
-    FairParIo& operator=(const FairParIo&);
-
     ClassDefOverride(FairParIo, 0);   // Base class for all parameter I/Os
 };