From 5a586e4282431536342b127459a37dc9f87bb33a Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 11 Feb 2014 11:25:02 +0100
Subject: [PATCH] renamed FileIO/MeshIO to FileIO/GmshIO and moved
 GmshInterface and TetGenInterface on level up

---
 FileIO/CMakeLists.txt                                 | 8 ++++++--
 FileIO/{MeshIO => }/GMSHInterface.cpp                 | 6 +++---
 FileIO/{MeshIO => }/GMSHInterface.h                   | 6 +++---
 FileIO/{MeshIO => GmshIO}/GMSHAdaptiveMeshDensity.cpp | 0
 FileIO/{MeshIO => GmshIO}/GMSHAdaptiveMeshDensity.h   | 0
 FileIO/{MeshIO => GmshIO}/GMSHFixedMeshDensity.cpp    | 2 +-
 FileIO/{MeshIO => GmshIO}/GMSHFixedMeshDensity.h      | 0
 FileIO/{MeshIO => GmshIO}/GMSHLine.cpp                | 2 +-
 FileIO/{MeshIO => GmshIO}/GMSHLine.h                  | 0
 FileIO/{MeshIO => GmshIO}/GMSHLineLoop.cpp            | 2 +-
 FileIO/{MeshIO => GmshIO}/GMSHLineLoop.h              | 0
 FileIO/{MeshIO => GmshIO}/GMSHMeshDensityStrategy.h   | 0
 FileIO/{MeshIO => GmshIO}/GMSHNoMeshDensity.h         | 0
 FileIO/{MeshIO => GmshIO}/GMSHPoint.cpp               | 2 +-
 FileIO/{MeshIO => GmshIO}/GMSHPoint.h                 | 0
 FileIO/{MeshIO => GmshIO}/GMSHPolygonTree.cpp         | 2 +-
 FileIO/{MeshIO => GmshIO}/GMSHPolygonTree.h           | 0
 FileIO/{MeshIO => }/TetGenInterface.cpp               | 0
 FileIO/{MeshIO => }/TetGenInterface.h                 | 0
 Gui/VtkAct/CMakeLists.txt                             | 2 +-
 Gui/mainwindow.cpp                                    | 5 ++---
 Utils/FileConverter/GMSH2OGS.cpp                      | 2 +-
 Utils/MeshEdit/CMakeLists.txt                         | 2 +-
 23 files changed, 22 insertions(+), 19 deletions(-)
 rename FileIO/{MeshIO => }/GMSHInterface.cpp (98%)
 rename FileIO/{MeshIO => }/GMSHInterface.h (96%)
 rename FileIO/{MeshIO => GmshIO}/GMSHAdaptiveMeshDensity.cpp (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHAdaptiveMeshDensity.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHFixedMeshDensity.cpp (95%)
 rename FileIO/{MeshIO => GmshIO}/GMSHFixedMeshDensity.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHLine.cpp (96%)
 rename FileIO/{MeshIO => GmshIO}/GMSHLine.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHLineLoop.cpp (97%)
 rename FileIO/{MeshIO => GmshIO}/GMSHLineLoop.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHMeshDensityStrategy.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHNoMeshDensity.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHPoint.cpp (97%)
 rename FileIO/{MeshIO => GmshIO}/GMSHPoint.h (100%)
 rename FileIO/{MeshIO => GmshIO}/GMSHPolygonTree.cpp (99%)
 rename FileIO/{MeshIO => GmshIO}/GMSHPolygonTree.h (100%)
 rename FileIO/{MeshIO => }/TetGenInterface.cpp (100%)
 rename FileIO/{MeshIO => }/TetGenInterface.h (100%)

diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 2e92adfc54c..cd5708b75b7 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -3,20 +3,24 @@
 SET( SOURCES
 	GMSInterface.h
 	GMSInterface.cpp
+	GMSHInterface.h
+	GMSHInterface.cpp
 	PetrelInterface.h
 	PetrelInterface.cpp
 	readMeshFromFile.h
 	readMeshFromFile.cpp
 	SHPInterface.h
 	SHPInterface.cpp
+	TetGenInterface.h
+	TetGenInterface.cpp
 	Writer.h
 	Writer.cpp
 )
 
 GET_SOURCE_FILES(SOURCES_LEGACY Legacy)
-GET_SOURCE_FILES(SOURCES_MESHIO MeshIO)
+GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
 GET_SOURCE_FILES(SOURCES_RAPID_XML RapidXmlIO)
-SET ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_MESHIO} ${SOURCES_RAPID_XML})
+SET ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_GMSHIO} ${SOURCES_RAPID_XML})
 
 GET_SOURCE_FILES(SOURCES_BASE_XML XmlIO)
 SET (SOURCES ${SOURCES} ${SOURCES_BASE_XML})
diff --git a/FileIO/MeshIO/GMSHInterface.cpp b/FileIO/GMSHInterface.cpp
similarity index 98%
rename from FileIO/MeshIO/GMSHInterface.cpp
rename to FileIO/GMSHInterface.cpp
index 15d22afb0a8..29a05f44bd0 100644
--- a/FileIO/MeshIO/GMSHInterface.cpp
+++ b/FileIO/GMSHInterface.cpp
@@ -28,10 +28,10 @@
 #include "StringTools.h"
 
 // FileIO
-#include "GMSHAdaptiveMeshDensity.h"
-#include "GMSHFixedMeshDensity.h"
 #include "GMSHInterface.h"
-#include "GMSHNoMeshDensity.h"
+#include "GmshIO/GMSHAdaptiveMeshDensity.h"
+#include "GmshIO/GMSHFixedMeshDensity.h"
+#include "GmshIO/GMSHNoMeshDensity.h"
 
 // GeoLib
 #include "Point.h"
diff --git a/FileIO/MeshIO/GMSHInterface.h b/FileIO/GMSHInterface.h
similarity index 96%
rename from FileIO/MeshIO/GMSHInterface.h
rename to FileIO/GMSHInterface.h
index 683481ae1b2..19083e71ee9 100644
--- a/FileIO/MeshIO/GMSHInterface.h
+++ b/FileIO/GMSHInterface.h
@@ -20,9 +20,9 @@
 
 // FileIO
 #include "Writer.h"
-#include "GMSHPoint.h"
-#include "GMSHPolygonTree.h"
-#include "GMSHMeshDensityStrategy.h"
+#include "GmshIO/GMSHPoint.h"
+#include "GmshIO/GMSHPolygonTree.h"
+#include "GmshIO/GMSHMeshDensityStrategy.h"
 
 // GeoLib
 #include "GEOObjects.h"
diff --git a/FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp b/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
similarity index 100%
rename from FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp
rename to FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
diff --git a/FileIO/MeshIO/GMSHAdaptiveMeshDensity.h b/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHAdaptiveMeshDensity.h
rename to FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHFixedMeshDensity.cpp b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
similarity index 95%
rename from FileIO/MeshIO/GMSHFixedMeshDensity.cpp
rename to FileIO/GmshIO/GMSHFixedMeshDensity.cpp
index 39de89e7c30..8727aca1ec8 100644
--- a/FileIO/MeshIO/GMSHFixedMeshDensity.cpp
+++ b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHFixedMeshDensity.h"
+#include "GmshIO/GMSHFixedMeshDensity.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHFixedMeshDensity.h b/FileIO/GmshIO/GMSHFixedMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHFixedMeshDensity.h
rename to FileIO/GmshIO/GMSHFixedMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHLine.cpp b/FileIO/GmshIO/GMSHLine.cpp
similarity index 96%
rename from FileIO/MeshIO/GMSHLine.cpp
rename to FileIO/GmshIO/GMSHLine.cpp
index 4869c64df68..c4a5ecf731e 100644
--- a/FileIO/MeshIO/GMSHLine.cpp
+++ b/FileIO/GmshIO/GMSHLine.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include <MeshIO/GMSHLine.h>
+#include <GmshIO/GMSHLine.h>
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHLine.h b/FileIO/GmshIO/GMSHLine.h
similarity index 100%
rename from FileIO/MeshIO/GMSHLine.h
rename to FileIO/GmshIO/GMSHLine.h
diff --git a/FileIO/MeshIO/GMSHLineLoop.cpp b/FileIO/GmshIO/GMSHLineLoop.cpp
similarity index 97%
rename from FileIO/MeshIO/GMSHLineLoop.cpp
rename to FileIO/GmshIO/GMSHLineLoop.cpp
index ac7b735ffe0..884db9dd57e 100644
--- a/FileIO/MeshIO/GMSHLineLoop.cpp
+++ b/FileIO/GmshIO/GMSHLineLoop.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHLineLoop.h"
+#include "GmshIO/GMSHLineLoop.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHLineLoop.h b/FileIO/GmshIO/GMSHLineLoop.h
similarity index 100%
rename from FileIO/MeshIO/GMSHLineLoop.h
rename to FileIO/GmshIO/GMSHLineLoop.h
diff --git a/FileIO/MeshIO/GMSHMeshDensityStrategy.h b/FileIO/GmshIO/GMSHMeshDensityStrategy.h
similarity index 100%
rename from FileIO/MeshIO/GMSHMeshDensityStrategy.h
rename to FileIO/GmshIO/GMSHMeshDensityStrategy.h
diff --git a/FileIO/MeshIO/GMSHNoMeshDensity.h b/FileIO/GmshIO/GMSHNoMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHNoMeshDensity.h
rename to FileIO/GmshIO/GMSHNoMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHPoint.cpp b/FileIO/GmshIO/GMSHPoint.cpp
similarity index 97%
rename from FileIO/MeshIO/GMSHPoint.cpp
rename to FileIO/GmshIO/GMSHPoint.cpp
index 8f4649ec202..997a614d5b4 100644
--- a/FileIO/MeshIO/GMSHPoint.cpp
+++ b/FileIO/GmshIO/GMSHPoint.cpp
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <limits>
 
-#include "MeshIO/GMSHPoint.h"
+#include "GmshIO/GMSHPoint.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHPoint.h b/FileIO/GmshIO/GMSHPoint.h
similarity index 100%
rename from FileIO/MeshIO/GMSHPoint.h
rename to FileIO/GmshIO/GMSHPoint.h
diff --git a/FileIO/MeshIO/GMSHPolygonTree.cpp b/FileIO/GmshIO/GMSHPolygonTree.cpp
similarity index 99%
rename from FileIO/MeshIO/GMSHPolygonTree.cpp
rename to FileIO/GmshIO/GMSHPolygonTree.cpp
index a32045c1e93..a560c1c9764 100644
--- a/FileIO/MeshIO/GMSHPolygonTree.cpp
+++ b/FileIO/GmshIO/GMSHPolygonTree.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHPolygonTree.h"
+#include "GmshIO/GMSHPolygonTree.h"
 
 #include "GMSHNoMeshDensity.h"
 #include "GMSHFixedMeshDensity.h"
diff --git a/FileIO/MeshIO/GMSHPolygonTree.h b/FileIO/GmshIO/GMSHPolygonTree.h
similarity index 100%
rename from FileIO/MeshIO/GMSHPolygonTree.h
rename to FileIO/GmshIO/GMSHPolygonTree.h
diff --git a/FileIO/MeshIO/TetGenInterface.cpp b/FileIO/TetGenInterface.cpp
similarity index 100%
rename from FileIO/MeshIO/TetGenInterface.cpp
rename to FileIO/TetGenInterface.cpp
diff --git a/FileIO/MeshIO/TetGenInterface.h b/FileIO/TetGenInterface.h
similarity index 100%
rename from FileIO/MeshIO/TetGenInterface.h
rename to FileIO/TetGenInterface.h
diff --git a/Gui/VtkAct/CMakeLists.txt b/Gui/VtkAct/CMakeLists.txt
index 610367bf465..d5f79ed551f 100644
--- a/Gui/VtkAct/CMakeLists.txt
+++ b/Gui/VtkAct/CMakeLists.txt
@@ -35,7 +35,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/MeshIO
+	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/GmshIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index 13fa4976ca8..57c1a2502e5 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -34,7 +34,6 @@
 #include "DataExplorerSettingsDialog.h"
 #include "DiagramPrefsDialog.h"
 #include "FEMConditionSetupDialog.h"
-//TODO6 #include "OGSFileConverter.h"
 #include "GeoOnMeshMappingDialog.h"
 #include "GMSHPrefsDialog.h"
 #include "LicenseDialog.h"
@@ -71,8 +70,8 @@
 #include "GMSInterface.h"
 #include "Legacy/MeshIO.h"
 #include "Legacy/OGSIOVer4.h"
-#include "MeshIO/GMSHInterface.h"
-#include "MeshIO/TetGenInterface.h"
+#include "GMSHInterface.h"
+#include "TetGenInterface.h"
 #include "PetrelInterface.h"
 #include "XmlIO/Qt/XmlCndInterface.h"
 #include "XmlIO/Qt/XmlGmlInterface.h"
diff --git a/Utils/FileConverter/GMSH2OGS.cpp b/Utils/FileConverter/GMSH2OGS.cpp
index 687a8f9e1e2..fdb73d18a3c 100644
--- a/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Utils/FileConverter/GMSH2OGS.cpp
@@ -17,7 +17,7 @@
 
 // FileIO
 #include "Legacy/MeshIO.h"
-#include "MeshIO/GMSHInterface.h"
+#include "GMSHInterface.h"
 
 // MeshLib
 #include "Mesh.h"
diff --git a/Utils/MeshEdit/CMakeLists.txt b/Utils/MeshEdit/CMakeLists.txt
index 6f93a8be815..908626e2986 100644
--- a/Utils/MeshEdit/CMakeLists.txt
+++ b/Utils/MeshEdit/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/FileIO
-	${CMAKE_SOURCE_DIR}/FileIO/MeshIO
+	${CMAKE_SOURCE_DIR}/FileIO/GmshIO
 	${CMAKE_SOURCE_DIR}/MathLib
 	${CMAKE_SOURCE_DIR}/MeshLib
 )
-- 
GitLab