class -> namespace

Device/Histo/IntensityDataIOFactory.cpp

@@ -50,7 +50,7 @@ OutputData<double>* IntensityDataIOFactory::readOutputData(const std::string& fi
 
     if (readAs(nicos))
         return readOutputData(file_name, [](std::istream& s) {
-            return OutputDataReadWriteNicos().readOutputData(s);
+            return IO::readNicosData(s);
         });
 
 #ifdef BORNAGAIN_TIFF_SUPPORT

Device/InputOutput/OutputDataReadWriteNicos.cpp

@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      Device/InputOutput/OutputDataReadWriteNicos.cpp
-//! @brief     Implements class OutputDataReadWriteNicos
+//! @brief     Implements function IO::readNicosData
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -44,7 +44,7 @@ unsigned int readAssignedPositiveIntValue(const std::string& line, int lineNumbe
 } // namespace
 
 
-OutputData<double>* OutputDataReadWriteNicos::readOutputData(std::istream& input_stream)
+OutputData<double>* IO::readNicosData(std::istream& input_stream)
 {
     auto result = std::make_unique<OutputData<double>>(); // as unique ptr to ensure delete on throw
     std::string line;

Device/InputOutput/OutputDataReadWriteNicos.h

@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      Device/InputOutput/OutputDataReadWriteNicos.h
-//! @brief     Defines class OutputDataReadWriteNicos
+//! @brief     Defines function IO::readNicosData
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -19,9 +19,10 @@
 
 //! Read/write SANSDRaw files written by Nicos (*.001).
 
-class OutputDataReadWriteNicos {
-public:
-    OutputData<double>* readOutputData(std::istream& input_stream);
+namespace IO {
+
+    OutputData<double>* readNicosData(std::istream& input_stream);
+
 };
 
 #endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADWRITENICOS_H

auto/Wrap/doxygenDevice.i

@@ -2118,18 +2118,6 @@ C++ includes: OutputDataReadWriteINT.h
 ";
 
 
-// File: classOutputDataReadWriteNicos.xml
-%feature("docstring") OutputDataReadWriteNicos "
-
-Read/write SANSDRaw files written by Nicos (*.001).
-
-C++ includes: OutputDataReadWriteNicos.h
-";
-
-%feature("docstring")  OutputDataReadWriteNicos::readOutputData "OutputData< double > * OutputDataReadWriteNicos::readOutputData(std::istream &input_stream)
-";
-
-
 // File: classOutputDataReadWriteNumpyTXT.xml
 %feature("docstring") OutputDataReadWriteNumpyTXT "
 
@@ -2964,6 +2952,11 @@ Returns true if SimulatioResult agrees with data from reference file.
 ";
 
 
+// File: namespaceIO.xml
+%feature("docstring")  IO::readNicosData "OutputData< double > * IO::readNicosData(std::istream &input_stream)
+";
+
+
 // File: Beam_8cpp.xml