Revert "clang-format; Linux compilation"

This reverts commit edba7bcb82046fdb0b6b3622d8ef0b5e4b9fcf5b.

Device/Histo/IntensityDataIOFactory.cpp

@@ -48,8 +48,8 @@ OutputData<double>* IntensityDataIOFactory::readOutputData(const std::string& fi
     // 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.
-    return readOutputData(
-        file_name, [](std::istream& s) { return OutputDataReadWriteNumpyTXT().readOutputData(s); });
+    return readOutputData(file_name,
+                   [](std::istream& s) { return OutputDataReadWriteNumpyTXT().readOutputData(s); });
 }
 
 OutputData<double>* IntensityDataIOFactory::readReflectometryData(const std::string& file_name) {
@@ -93,7 +93,7 @@ void IntensityDataIOFactory::writeOutputData(const std::string& file_name,
 #ifdef _WIN32
     fout.open(FileSystemUtils::convert_utf8_to_utf16(file_name), openmode);
 #else
-    fout.open(file_name, openmode);
+    fout.open(m_file_name, openmode);
 #endif
 
     if (!fout.is_open())
@@ -146,7 +146,7 @@ IntensityDataIOFactory::readOutputData(const std::string& file_name,
 #ifdef _WIN32
     input_stream.open(FileSystemUtils::convert_utf8_to_utf16(file_name), openmode);
 #else
-    input_stream.open(file_name, openmode);
+    fin.open(m_file_name, openmode);
 #endif
 
     if (!input_stream.is_open())

Device/Histo/IntensityDataIOFactory.h

@@ -63,12 +63,11 @@ public:
     static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
 
 private:
-    static OutputData<double>*
-    readOutputData(const std::string& file_name,
-                   std::function<OutputData<double>*(std::istream&)> readData);
-
-    static void writeOutputData(const std::string& file_name,
-                                std::function<void(std::ostream&)> writeData);
+    static OutputData<double>* readOutputData(const std::string& file_name,
+        std::function<OutputData<double>* (std::istream&)> readData);
+
+    static void writeOutputData(const std::string& file_name, 
+        std::function<void(std::ostream&)> writeData);
 };
 
 #endif // BORNAGAIN_DEVICE_HISTO_INTENSITYDATAIOFACTORY_H

Device/InputOutput/OutputDataReadWriteINT.cpp

@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Device/InputOutput/OutputDataReadWriteINT.h"
-#include "Base/Utils/StringUtils.h"
 #include "Device/InputOutput/DataFormatUtils.h"
+#include "Base/Utils/StringUtils.h"
 #include "Device/Intensity/ArrayUtils.h"
 
 namespace {