IOFactory: disambiguate fct names

Device/IO/IOFactory.cpp

@@ -50,23 +50,23 @@ Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector
     Datafield* result = nullptr;
 
     if (readAs(bornagain))
-        result = readDatafield(file_name,
-                               [](std::istream& s) { return ReadWriteINT().readDatafield(s); });
+        result = functional_read(file_name,
+                                 [](std::istream& s) { return ReadWriteINT().readDatafield(s); });
 
     else if (readAs(nicos))
-        result = readDatafield(file_name, [](std::istream& s) { return IO::readNicosData(s); });
+        result = functional_read(file_name, [](std::istream& s) { return IO::readNicosData(s); });
 
 #ifdef BA_TIFF_SUPPORT
     else if (readAs(tiff))
-        result = readDatafield(file_name,
-                               [](std::istream& s) { return ReadWriteTiff().readDatafield(s); });
+        result = functional_read(file_name,
+                                 [](std::istream& s) { return ReadWriteTiff().readDatafield(s); });
 #endif
 
     else
         // Try to read ASCII by default. Binary maps to ASCII.
         // If the file is not actually a matrix of numbers,
         // the error will be thrown during the reading.
-        result = readDatafield(
+        result = functional_read(
             file_name, [](std::istream& s) { return ReadWriteNumpyTXT().readDatafield(s); });
 
     ASSERT(result);
@@ -75,26 +75,27 @@ Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector
 
 Datafield* IOFactory::readReflectometryData(const std::string& file_name)
 {
-    return readDatafield(file_name,
-                         [](std::istream& s) { return ReadReflectometry().readDatafield(s); });
+    return functional_read(file_name,
+                           [](std::istream& s) { return ReadReflectometry().readDatafield(s); });
 }
 
 void IOFactory::writeDatafield(const Datafield& data, const std::string& file_name)
 {
     if (DataUtils::Format::isIntFile(file_name))
-        writeDatafield(file_name, [&](std::ostream& s) { ReadWriteINT().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteINT().writeDatafield(data, s); });
 #ifdef BA_TIFF_SUPPORT
     else if (DataUtils::Format::isTiffFile(file_name))
-        writeDatafield(file_name,
-                       [&](std::ostream& s) { ReadWriteTiff().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteTiff().writeDatafield(data, s); });
 #endif
     else
-        writeDatafield(file_name,
-                       [&](std::ostream& s) { ReadWriteNumpyTXT().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteNumpyTXT().writeDatafield(data, s); });
 }
 
-void IOFactory::writeDatafield(const std::string& file_name,
-                               std::function<void(std::ostream&)> writeData)
+void IOFactory::functional_write(const std::string& file_name,
+                                 std::function<void(std::ostream&)> writeData)
 {
     using namespace DataUtils::Format;
 
@@ -149,8 +150,8 @@ void IOFactory::writeSimulationResult(const SimulationResult& result, const std:
     writeDatafield(result.data_field(), file_name);
 }
 
-Datafield* IOFactory::readDatafield(const std::string& file_name,
-                                    std::function<Datafield*(std::istream&)> readData)
+Datafield* IOFactory::functional_read(const std::string& file_name,
+                                      std::function<Datafield*(std::istream&)> readData)
 {
     if (!BaseUtils::Filesystem::IsFileExists(file_name))
         throw std::runtime_error("File does not exist: " + file_name);

Device/IO/IOFactory.h

@@ -63,11 +63,11 @@ public:
     static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
 
 private:
-    static Datafield* readDatafield(const std::string& file_name,
-                                    std::function<Datafield*(std::istream&)> readData);
+    static Datafield* functional_read(const std::string& file_name,
+                                      std::function<Datafield*(std::istream&)> readData);
 
-    static void writeDatafield(const std::string& file_name,
-                               std::function<void(std::ostream&)> writeData);
+    static void functional_write(const std::string& file_name,
+                                 std::function<void(std::ostream&)> writeData);
 
     static bool fileTypeMatchesLoaderSelector(const std::string& fileName, LoaderSelector selector);
 };