From 2e502f29025a39accd03caea245b53ac8bcc8a54 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 29 Apr 2016 13:25:33 +0200
Subject: [PATCH] Move Writer from FileIO to BaseLib/IO.

---
 BaseLib/CMakeLists.txt              |  3 +++
 {FileIO => BaseLib/IO}/Writer.cpp   |  7 +++++--
 {FileIO => BaseLib/IO}/Writer.h     |  7 +++++--
 FileIO/CMakeLists.txt               |  2 --
 FileIO/GMSHInterface.h              | 11 +++++------
 FileIO/Legacy/MeshIO.h              |  4 ++--
 FileIO/XmlIO/Qt/XmlGspInterface.cpp |  4 ++--
 FileIO/XmlIO/XMLInterface.h         |  4 ++--
 8 files changed, 24 insertions(+), 18 deletions(-)
 rename {FileIO => BaseLib/IO}/Writer.cpp (94%)
 rename {FileIO => BaseLib/IO}/Writer.h (95%)

diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index cd973a28f8a..0db5a1ac0b8 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -1,4 +1,7 @@
 GET_SOURCE_FILES(SOURCES)
+GET_SOURCE_FILES(SOURCES_IO IO)
+
+set(SOURCES ${SOURCES} ${SOURCES_IO})
 
 list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.cpp" BuildInfo.h)
 
diff --git a/FileIO/Writer.cpp b/BaseLib/IO/Writer.cpp
similarity index 94%
rename from FileIO/Writer.cpp
rename to BaseLib/IO/Writer.cpp
index 8b03518937b..9ae1fe21c3b 100644
--- a/FileIO/Writer.cpp
+++ b/BaseLib/IO/Writer.cpp
@@ -19,7 +19,9 @@
 #include <fstream>
 #include <limits>
 
-namespace FileIO
+namespace BaseLib
+{
+namespace IO
 {
 
 Writer::Writer()
@@ -72,4 +74,5 @@ void Writer::setFormat(std::ios_base::fmtflags flags)
 	_out.setf(flags);
 }
 
-} // namespace FileIO
+} // namespace IO
+} // namespace BaseLib
diff --git a/FileIO/Writer.h b/BaseLib/IO/Writer.h
similarity index 95%
rename from FileIO/Writer.h
rename to BaseLib/IO/Writer.h
index 94a4538cc1d..2a665239120 100644
--- a/FileIO/Writer.h
+++ b/BaseLib/IO/Writer.h
@@ -18,7 +18,9 @@
 #include <string>
 #include <sstream>
 
-namespace FileIO
+namespace BaseLib
+{
+namespace IO
 {
 
 /// @brief Base class which enables writing an object to string, stringstream
@@ -58,6 +60,7 @@ private:
 
 };
 
-} // namespace FileIO
+} // namespace IO
+} // namespace BaseLib
 
 #endif // WRITER_H
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 71bc8c024f9..7e9030809c2 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -19,8 +19,6 @@ set(SOURCES
 	TetGenInterface.cpp
 	TINInterface.h
 	TINInterface.cpp
-	Writer.h
-	Writer.cpp
 	writeMeshToFile.h
 	writeMeshToFile.cpp
 )
diff --git a/FileIO/GMSHInterface.h b/FileIO/GMSHInterface.h
index 9ac706ff741..5971665cf1c 100644
--- a/FileIO/GMSHInterface.h
+++ b/FileIO/GMSHInterface.h
@@ -19,11 +19,10 @@
 #include <map>
 #include <string>
 
-// FileIO
-#include "Writer.h"
-#include "GmshIO/GMSHPoint.h"
-#include "GmshIO/GMSHPolygonTree.h"
-#include "GmshIO/GMSHMeshDensityStrategy.h"
+#include "BaseLib/IO/Writer.h"
+#include "FileIO/GmshIO/GMSHPoint.h"
+#include "FileIO/GmshIO/GMSHPolygonTree.h"
+#include "FileIO/GmshIO/GMSHMeshDensityStrategy.h"
 
 #include "MathLib/LinAlg/Dense/DenseMatrix.h"
 
@@ -55,7 +54,7 @@ enum class MeshDensityAlgorithm {
 /**
  * \brief Reads and writes GMSH-files to and from OGS data structures.
  */
-class GMSHInterface : public Writer
+class GMSHInterface : public BaseLib::IO::Writer
 {
 public:
 
diff --git a/FileIO/Legacy/MeshIO.h b/FileIO/Legacy/MeshIO.h
index 1c5bfa60bf2..257f4980245 100644
--- a/FileIO/Legacy/MeshIO.h
+++ b/FileIO/Legacy/MeshIO.h
@@ -21,7 +21,7 @@
 #include <vector>
 #include <boost/optional.hpp>
 
-#include "FileIO/Writer.h"
+#include "BaseLib/IO/Writer.h"
 #include "MeshLib/MeshEnums.h"
 #include "MeshLib/PropertyVector.h"
 
@@ -39,7 +39,7 @@ namespace FileIO
 namespace Legacy {
 
 /// Interface for handling mesh files from OGS-5 and below. (*.msh files)
-class MeshIO : public Writer
+class MeshIO : public BaseLib::IO::Writer
 {
 public:
 	/// Constructor.
diff --git a/FileIO/XmlIO/Qt/XmlGspInterface.cpp b/FileIO/XmlIO/Qt/XmlGspInterface.cpp
index ee51b8121a5..6ea431c7f3e 100644
--- a/FileIO/XmlIO/Qt/XmlGspInterface.cpp
+++ b/FileIO/XmlIO/Qt/XmlGspInterface.cpp
@@ -26,8 +26,8 @@
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/FileFinder.h"
+#include "BaseLib/IO/Writer.h"
 
-#include "FileIO/Writer.h"
 #include "FileIO/Legacy/MeshIO.h"
 #include "FileIO/readMeshFromFile.h"
 #include "MeshLib/Mesh.h"
@@ -109,7 +109,7 @@ int XmlGspInterface::readFile(const QString &fileName)
 int XmlGspInterface::writeToFile(const std::string& filename)
 {
 	_filename = filename;
-	return FileIO::Writer::writeToFile(filename);
+	return BaseLib::IO::Writer::writeToFile(filename);
 }
 
 bool XmlGspInterface::write()
diff --git a/FileIO/XmlIO/XMLInterface.h b/FileIO/XmlIO/XMLInterface.h
index 4531c6af868..6527c61f475 100644
--- a/FileIO/XmlIO/XMLInterface.h
+++ b/FileIO/XmlIO/XMLInterface.h
@@ -17,14 +17,14 @@
 
 #include <string>
 
-#include "FileIO/Writer.h"
+#include "BaseLib/IO/Writer.h"
 
 namespace FileIO
 {
 /**
  * \brief Base class for writing any information to and from XML files.
  */
-class XMLInterface : public Writer
+class XMLInterface : public BaseLib::IO::Writer
 {
 public:
 	XMLInterface();
-- 
GitLab