From abfa85bac6a3c8d583c63a248dbd4d664e713b8f Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 15 Oct 2013 08:40:46 +0200
Subject: [PATCH] Moved XML implementations deploying Qt stuff into subfolder.

---
 FileIO/CMakeLists.txt                            | 8 +++++---
 FileIO/XmlIO/{ => Qt}/XMLQtInterface.cpp         | 2 +-
 FileIO/XmlIO/{ => Qt}/XMLQtInterface.h           | 0
 FileIO/XmlIO/{ => Qt}/XmlCndInterface.cpp        | 0
 FileIO/XmlIO/{ => Qt}/XmlCndInterface.h          | 2 +-
 FileIO/XmlIO/{ => Qt}/XmlGmlInterface.cpp        | 0
 FileIO/XmlIO/{ => Qt}/XmlGmlInterface.h          | 4 ++--
 FileIO/XmlIO/{ => Qt}/XmlGspInterface.cpp        | 0
 FileIO/XmlIO/{ => Qt}/XmlGspInterface.h          | 2 +-
 FileIO/XmlIO/{ => Qt}/XmlLutReader.h             | 0
 FileIO/XmlIO/{ => Qt}/XmlStnInterface.cpp        | 0
 FileIO/XmlIO/{ => Qt}/XmlStnInterface.h          | 2 +-
 Gui/VtkVis/VtkAlgorithmProperties.cpp            | 2 +-
 Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp | 2 +-
 Gui/mainwindow.cpp                               | 8 ++++----
 Tests/FileIO/TestXmlGmlReader.cpp                | 2 +-
 Utils/FileConverter/ConvertSHPToGLI.cpp          | 4 ++--
 Utils/FileConverter/generateBCFromPolyline.cpp   | 2 +-
 Utils/FileConverter/generateBCandGLI.cpp         | 2 +-
 19 files changed, 22 insertions(+), 20 deletions(-)
 rename FileIO/XmlIO/{ => Qt}/XMLQtInterface.cpp (98%)
 rename FileIO/XmlIO/{ => Qt}/XMLQtInterface.h (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlCndInterface.cpp (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlCndInterface.h (98%)
 rename FileIO/XmlIO/{ => Qt}/XmlGmlInterface.cpp (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlGmlInterface.h (97%)
 rename FileIO/XmlIO/{ => Qt}/XmlGspInterface.cpp (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlGspInterface.h (97%)
 rename FileIO/XmlIO/{ => Qt}/XmlLutReader.h (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlStnInterface.cpp (100%)
 rename FileIO/XmlIO/{ => Qt}/XmlStnInterface.h (98%)

diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index e22771dd5ea..7d924b1292d 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -18,9 +18,11 @@ GET_SOURCE_FILES(SOURCES_MESHIO MeshIO)
 GET_SOURCE_FILES(SOURCES_RAPID_XML RapidXmlIO)
 SET ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_MESHIO} ${SOURCES_RAPID_XML})
 
+GET_SOURCE_FILES(SOURCES_BASE_XML XmlIO)
+SET (SOURCES ${SOURCES} ${SOURCES_BASE_XML})
 IF (QT4_FOUND)
-	GET_SOURCE_FILES(SOURCES_XML XmlIO)
-	SET ( SOURCES ${SOURCES} ${SOURCES_XML})
+	GET_SOURCE_FILES(SOURCES_QT_XML XmlIO/Qt)
+	SET ( SOURCES ${SOURCES} ${SOURCES_QT_XML})
 ENDIF (QT4_FOUND)
 
 IF (Shapelib_FOUND)
@@ -54,4 +56,4 @@ ENDIF (Shapelib_FOUND)
 IF (OGS_PACKAGING)
 	FILE(GLOB XSD_FILES . *.xsd)
 	INSTALL (FILES ${XSD_FILES} DESTINATION bin)
-ENDIF()
\ No newline at end of file
+ENDIF()
diff --git a/FileIO/XmlIO/XMLQtInterface.cpp b/FileIO/XmlIO/Qt/XMLQtInterface.cpp
similarity index 98%
rename from FileIO/XmlIO/XMLQtInterface.cpp
rename to FileIO/XmlIO/Qt/XMLQtInterface.cpp
index be5550ca1fb..f08a9df239e 100644
--- a/FileIO/XmlIO/XMLQtInterface.cpp
+++ b/FileIO/XmlIO/Qt/XMLQtInterface.cpp
@@ -11,7 +11,7 @@
  *              http://www.opengeosys.org/LICENSE.txt
  */
 
-#include "XmlIO/XMLQtInterface.h"
+#include "XmlIO/Qt/XMLQtInterface.h"
 
 #include <fstream>
 
diff --git a/FileIO/XmlIO/XMLQtInterface.h b/FileIO/XmlIO/Qt/XMLQtInterface.h
similarity index 100%
rename from FileIO/XmlIO/XMLQtInterface.h
rename to FileIO/XmlIO/Qt/XMLQtInterface.h
diff --git a/FileIO/XmlIO/XmlCndInterface.cpp b/FileIO/XmlIO/Qt/XmlCndInterface.cpp
similarity index 100%
rename from FileIO/XmlIO/XmlCndInterface.cpp
rename to FileIO/XmlIO/Qt/XmlCndInterface.cpp
diff --git a/FileIO/XmlIO/XmlCndInterface.h b/FileIO/XmlIO/Qt/XmlCndInterface.h
similarity index 98%
rename from FileIO/XmlIO/XmlCndInterface.h
rename to FileIO/XmlIO/Qt/XmlCndInterface.h
index 6b0257c6569..a95c2de9c5d 100644
--- a/FileIO/XmlIO/XmlCndInterface.h
+++ b/FileIO/XmlIO/Qt/XmlCndInterface.h
@@ -19,7 +19,7 @@
 #include "logog/include/logog.hpp"
 
 // FileIO/XmlIO
-#include "XMLInterface.h"
+#include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
 class FEMCondition;
diff --git a/FileIO/XmlIO/XmlGmlInterface.cpp b/FileIO/XmlIO/Qt/XmlGmlInterface.cpp
similarity index 100%
rename from FileIO/XmlIO/XmlGmlInterface.cpp
rename to FileIO/XmlIO/Qt/XmlGmlInterface.cpp
diff --git a/FileIO/XmlIO/XmlGmlInterface.h b/FileIO/XmlIO/Qt/XmlGmlInterface.h
similarity index 97%
rename from FileIO/XmlIO/XmlGmlInterface.h
rename to FileIO/XmlIO/Qt/XmlGmlInterface.h
index 24837ef5cbc..39bb8605d73 100644
--- a/FileIO/XmlIO/XmlGmlInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGmlInterface.h
@@ -15,7 +15,7 @@
 #ifndef XMLGMLINTERFACE_H
 #define XMLGMLINTERFACE_H
 
-#include "XMLInterface.h"
+#include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
 namespace FileIO
@@ -34,7 +34,7 @@ public:
 	 */
 	XmlGmlInterface(GeoLib::GEOObjects& geo_objs, const std::string &schemaFile);
 
-	virtual ~XmlGmlInterface() {};
+	virtual ~XmlGmlInterface() {}
 
 	/// Reads an xml-file containing geometric object definitions into the GEOObjects used in the contructor
 	int readFile(const QString &fileName);
diff --git a/FileIO/XmlIO/XmlGspInterface.cpp b/FileIO/XmlIO/Qt/XmlGspInterface.cpp
similarity index 100%
rename from FileIO/XmlIO/XmlGspInterface.cpp
rename to FileIO/XmlIO/Qt/XmlGspInterface.cpp
diff --git a/FileIO/XmlIO/XmlGspInterface.h b/FileIO/XmlIO/Qt/XmlGspInterface.h
similarity index 97%
rename from FileIO/XmlIO/XmlGspInterface.h
rename to FileIO/XmlIO/Qt/XmlGspInterface.h
index 0a8badf0f67..7308cdaf18d 100644
--- a/FileIO/XmlIO/XmlGspInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -15,7 +15,7 @@
 #ifndef XMLGSPINTERFACE_H
 #define XMLGSPINTERFACE_H
 
-#include "XMLInterface.h"
+#include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
 namespace FileIO
diff --git a/FileIO/XmlIO/XmlLutReader.h b/FileIO/XmlIO/Qt/XmlLutReader.h
similarity index 100%
rename from FileIO/XmlIO/XmlLutReader.h
rename to FileIO/XmlIO/Qt/XmlLutReader.h
diff --git a/FileIO/XmlIO/XmlStnInterface.cpp b/FileIO/XmlIO/Qt/XmlStnInterface.cpp
similarity index 100%
rename from FileIO/XmlIO/XmlStnInterface.cpp
rename to FileIO/XmlIO/Qt/XmlStnInterface.cpp
diff --git a/FileIO/XmlIO/XmlStnInterface.h b/FileIO/XmlIO/Qt/XmlStnInterface.h
similarity index 98%
rename from FileIO/XmlIO/XmlStnInterface.h
rename to FileIO/XmlIO/Qt/XmlStnInterface.h
index 1ab9597b66c..189ef52ae54 100644
--- a/FileIO/XmlIO/XmlStnInterface.h
+++ b/FileIO/XmlIO/Qt/XmlStnInterface.h
@@ -17,7 +17,7 @@
 
 #include "RapidXML/rapidxml.hpp"
 
-#include "XMLInterface.h"
+#include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
 namespace GeoLib {
diff --git a/Gui/VtkVis/VtkAlgorithmProperties.cpp b/Gui/VtkVis/VtkAlgorithmProperties.cpp
index 04a1cd922ee..c7f9c3be4ed 100644
--- a/Gui/VtkVis/VtkAlgorithmProperties.cpp
+++ b/Gui/VtkVis/VtkAlgorithmProperties.cpp
@@ -22,7 +22,7 @@
 #include <vtkTexture.h>
 
 #include "VtkColorLookupTable.h"
-#include "XmlIO/XmlLutReader.h"
+#include "XmlIO/Qt/XmlLutReader.h"
 
 VtkAlgorithmProperties::VtkAlgorithmProperties(QObject* parent /*= nullptr*/)
 	: QObject(parent)
diff --git a/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
index 48d38c19e2e..04f98f1d39b 100644
--- a/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
+++ b/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
@@ -25,7 +25,7 @@
 #include <QFileDialog>
 
 #include "VtkColorLookupTable.h"
-#include "XmlIO/XmlLutReader.h"
+#include "XmlIO/Qt/XmlLutReader.h"
 
 VtkCompositeColormapToImageFilter::VtkCompositeColormapToImageFilter( vtkAlgorithm* inputAlgorithm )
 	: VtkCompositeFilter(inputAlgorithm)
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index 68c172e4fb4..edf7f34a167 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -75,10 +75,10 @@
 #include "MeshIO/GMSHInterface.h"
 #include "MeshIO/TetGenInterface.h"
 #include "PetrelInterface.h"
-#include "XmlIO/XmlCndInterface.h"
-#include "XmlIO/XmlGmlInterface.h"
-#include "XmlIO/XmlGspInterface.h"
-#include "XmlIO/XmlStnInterface.h"
+#include "XmlIO/Qt/XmlCndInterface.h"
+#include "XmlIO/Qt/XmlGmlInterface.h"
+#include "XmlIO/Qt/XmlGspInterface.h"
+#include "XmlIO/Qt/XmlStnInterface.h"
 
 #include "StringTools.h"
 
diff --git a/Tests/FileIO/TestXmlGmlReader.cpp b/Tests/FileIO/TestXmlGmlReader.cpp
index f2c6c74bc91..bac1d7a8cba 100644
--- a/Tests/FileIO/TestXmlGmlReader.cpp
+++ b/Tests/FileIO/TestXmlGmlReader.cpp
@@ -18,7 +18,7 @@
 #include "Configure.h"
 
 // FileIO
-#include "XmlIO/XmlGmlInterface.h"
+#include "XmlIO/Qt/XmlGmlInterface.h"
 
 // OgsLib
 #include "OGS/ProjectData.h"
diff --git a/Utils/FileConverter/ConvertSHPToGLI.cpp b/Utils/FileConverter/ConvertSHPToGLI.cpp
index 26f5b4ca50d..a446909cd60 100644
--- a/Utils/FileConverter/ConvertSHPToGLI.cpp
+++ b/Utils/FileConverter/ConvertSHPToGLI.cpp
@@ -31,8 +31,8 @@
 #include "StringTools.h"
 
 // FileIO
-#include "XmlIO/XmlGmlInterface.h"
-#include "XmlIO/XmlStnInterface.h"
+#include "XmlIO/Qt/XmlGmlInterface.h"
+#include "XmlIO/Qt/XmlStnInterface.h"
 
 // GeoLib
 #include "GEOObjects.h"
diff --git a/Utils/FileConverter/generateBCFromPolyline.cpp b/Utils/FileConverter/generateBCFromPolyline.cpp
index d737713e0e7..f14ba6eb4dc 100644
--- a/Utils/FileConverter/generateBCFromPolyline.cpp
+++ b/Utils/FileConverter/generateBCFromPolyline.cpp
@@ -24,7 +24,7 @@
 #include "OGS/ProjectData.h"
 
 // FileIO
-#include "XmlIO/XmlGmlInterface.h"
+#include "XmlIO/Qt/XmlGmlInterface.h"
 
 int main (int argc, char* argv[])
 {
diff --git a/Utils/FileConverter/generateBCandGLI.cpp b/Utils/FileConverter/generateBCandGLI.cpp
index 4f9571d1f15..fac1ff2ccb5 100644
--- a/Utils/FileConverter/generateBCandGLI.cpp
+++ b/Utils/FileConverter/generateBCandGLI.cpp
@@ -27,7 +27,7 @@
 #include "OGS/ProjectData.h"
 
 // FileIO
-#include "XmlIO/XmlGmlInterface.h"
+#include "XmlIO/Qt/XmlGmlInterface.h"
 
 int main (int argc, char* argv[])
 {
-- 
GitLab