From a4fc64d2d45910e861418733928f9ba574c3cb31 Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu, 15 Aug 2013 12:04:56 +0200 Subject: [PATCH] Renamed MshEnums.{h,cpp} to MeshEnums.{h,cpp}. --- FileIO/GMSInterface.cpp | 2 +- FileIO/RapidXmlIO/BoostVtuInterface.h | 2 +- FileIO/RapidXmlIO/RapidVtuInterface.h | 2 +- Gui/DataView/MshModel.cpp | 2 +- Gui/DataView/MshQualitySelectionDialog.h | 2 +- Gui/VtkVis/VtkMeshConverter.h | 2 +- Gui/VtkVis/VtkVisPipeline.h | 2 +- MeshLib/Elements/Element.h | 2 +- MeshLib/Elements/TemplateEdge.h | 2 +- MeshLib/Elements/TemplateHex.h | 2 +- MeshLib/Elements/TemplatePrism.h | 2 +- MeshLib/Elements/TemplatePyramid.h | 2 +- MeshLib/Elements/TemplateQuad.h | 2 +- MeshLib/Elements/TemplateTet.h | 2 +- MeshLib/Elements/TemplateTri.h | 2 +- MeshLib/Mesh.h | 2 +- MeshLib/{MshEnums.cpp => MeshEnums.cpp} | 2 +- MeshLib/{MshEnums.h => MeshEnums.h} | 6 +++--- MeshLib/MeshGenerators/ConvertRasterToMesh.h | 2 +- .../createMeshElemPropertiesFromASCRaster.cpp | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) rename MeshLib/{MshEnums.cpp => MeshEnums.cpp} (98%) rename MeshLib/{MshEnums.h => MeshEnums.h} (95%) diff --git a/FileIO/GMSInterface.cpp b/FileIO/GMSInterface.cpp index 1f5c2524c92..718fbcd381f 100644 --- a/FileIO/GMSInterface.cpp +++ b/FileIO/GMSInterface.cpp @@ -25,7 +25,7 @@ #include "Elements/Tet.h" #include "GMSInterface.h" #include "Mesh.h" -#include "MshEnums.h" +#include "MeshEnums.h" #include "Node.h" #include "StationBorehole.h" // BaseLib diff --git a/FileIO/RapidXmlIO/BoostVtuInterface.h b/FileIO/RapidXmlIO/BoostVtuInterface.h index 5550999aa73..5b5df346454 100644 --- a/FileIO/RapidXmlIO/BoostVtuInterface.h +++ b/FileIO/RapidXmlIO/BoostVtuInterface.h @@ -20,7 +20,7 @@ #include <string> #include <vector> -#include "MshEnums.h" +#include "MeshEnums.h" #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/xml_parser.hpp> diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.h b/FileIO/RapidXmlIO/RapidVtuInterface.h index 664fd891d37..9928597555f 100644 --- a/FileIO/RapidXmlIO/RapidVtuInterface.h +++ b/FileIO/RapidXmlIO/RapidVtuInterface.h @@ -20,7 +20,7 @@ #include <string> #include <vector> -#include "MshEnums.h" +#include "MeshEnums.h" #include "RapidXML/rapidxml.hpp" class ProjectData; diff --git a/Gui/DataView/MshModel.cpp b/Gui/DataView/MshModel.cpp index 56e6c35ec59..534e2717e28 100644 --- a/Gui/DataView/MshModel.cpp +++ b/Gui/DataView/MshModel.cpp @@ -26,7 +26,7 @@ // MeshLib #include "Node.h" #include "Elements/Element.h" -#include "MshEnums.h" +#include "MeshEnums.h" // Qt #include <QFileInfo> diff --git a/Gui/DataView/MshQualitySelectionDialog.h b/Gui/DataView/MshQualitySelectionDialog.h index ce5778f5bba..ef4812c70d4 100644 --- a/Gui/DataView/MshQualitySelectionDialog.h +++ b/Gui/DataView/MshQualitySelectionDialog.h @@ -15,7 +15,7 @@ #ifndef MSHQUALITYSELECTIONDIALOG_H #define MSHQUALITYSELECTIONDIALOG_H -#include "MshEnums.h" +#include "MeshEnums.h" #include "ui_MshQualitySelection.h" #include <QDialog> diff --git a/Gui/VtkVis/VtkMeshConverter.h b/Gui/VtkVis/VtkMeshConverter.h index 8d98c6ff22d..da79fedbc8f 100644 --- a/Gui/VtkVis/VtkMeshConverter.h +++ b/Gui/VtkVis/VtkMeshConverter.h @@ -20,7 +20,7 @@ namespace MeshLib { class Mesh; } -#include "MshEnums.h" +#include "MeshEnums.h" class vtkImageData; // For conversion from Image to QuadMesh class vtkUnstructuredGrid; // For conversion vom vtk to ogs mesh diff --git a/Gui/VtkVis/VtkVisPipeline.h b/Gui/VtkVis/VtkVisPipeline.h index 3fa2f0508e0..545d8c7e231 100644 --- a/Gui/VtkVis/VtkVisPipeline.h +++ b/Gui/VtkVis/VtkVisPipeline.h @@ -19,7 +19,7 @@ #include "Color.h" #include "FEMCondition.h" #include "GeoType.h" -#include "MshEnums.h" +#include "MeshEnums.h" #include "Point.h" #include "TreeModel.h" diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h index c31210925e5..f1e9e8a3142 100644 --- a/MeshLib/Elements/Element.h +++ b/MeshLib/Elements/Element.h @@ -16,7 +16,7 @@ #define ELEMENT_H_ #include <vector> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Mesh.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplateEdge.h b/MeshLib/Elements/TemplateEdge.h index 0a6d35265d9..630cdeeeb08 100644 --- a/MeshLib/Elements/TemplateEdge.h +++ b/MeshLib/Elements/TemplateEdge.h @@ -18,7 +18,7 @@ #include <array> #include <limits> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Element.h" #include "Node.h" diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h index b705f3c8c0a..c11dc0d5ac1 100644 --- a/MeshLib/Elements/TemplateHex.h +++ b/MeshLib/Elements/TemplateHex.h @@ -16,7 +16,7 @@ #define TEMPLATEHEX_H_ #include <array> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Cell.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h index 9a1b48c7303..7947d02d71c 100644 --- a/MeshLib/Elements/TemplatePrism.h +++ b/MeshLib/Elements/TemplatePrism.h @@ -16,7 +16,7 @@ #define TEMPLATEPRISM_H_ #include <array> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Cell.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h index cf213dd041a..da01bbb5668 100644 --- a/MeshLib/Elements/TemplatePyramid.h +++ b/MeshLib/Elements/TemplatePyramid.h @@ -16,7 +16,7 @@ #define TEMPLATEPYRAMID_H_ #include <array> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Cell.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h index 049b1ab58c7..4acd39f9183 100644 --- a/MeshLib/Elements/TemplateQuad.h +++ b/MeshLib/Elements/TemplateQuad.h @@ -16,7 +16,7 @@ #define TEMPLATEQUAD_H_ #include <array> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Face.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h index 71a430ee6ac..51fa10769fe 100644 --- a/MeshLib/Elements/TemplateTet.h +++ b/MeshLib/Elements/TemplateTet.h @@ -16,7 +16,7 @@ #define TEMPLATETET_H_ #include <array> -#include "MshEnums.h" +#include "MeshEnums.h" #include "Cell.h" namespace MeshLib { diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h index 3adaa403998..ac299793ade 100644 --- a/MeshLib/Elements/TemplateTri.h +++ b/MeshLib/Elements/TemplateTri.h @@ -19,7 +19,7 @@ #include "Edge.h" #include "Node.h" #include "Face.h" -#include "MshEnums.h" +#include "MeshEnums.h" #include "MathTools.h" diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h index 7f80d6128b5..239497d71a8 100644 --- a/MeshLib/Mesh.h +++ b/MeshLib/Mesh.h @@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "MshEnums.h" +#include "MeshEnums.h" #include "BaseLib/Counter.h" diff --git a/MeshLib/MshEnums.cpp b/MeshLib/MeshEnums.cpp similarity index 98% rename from MeshLib/MshEnums.cpp rename to MeshLib/MeshEnums.cpp index 813e8f76b5f..3a13628987c 100644 --- a/MeshLib/MshEnums.cpp +++ b/MeshLib/MeshEnums.cpp @@ -12,7 +12,7 @@ * */ -#include "MshEnums.h" +#include "MeshEnums.h" const std::string MshElemType2String(const MshElemType::type t) { diff --git a/MeshLib/MshEnums.h b/MeshLib/MeshEnums.h similarity index 95% rename from MeshLib/MshEnums.h rename to MeshLib/MeshEnums.h index 760f78df014..61d66969d79 100644 --- a/MeshLib/MshEnums.h +++ b/MeshLib/MeshEnums.h @@ -12,8 +12,8 @@ * */ -#ifndef MSHENUMS_H -#define MSHENUMS_H +#ifndef MESHENUMS_H +#define MESHENUMS_H #include <string> @@ -82,4 +82,4 @@ MshElemType::type String2MshElemType(const std::string &s); const std::string MshQualityType2String(const MshQualityType::type t); -#endif //MSHENUMS_H +#endif //MESHENUMS_H diff --git a/MeshLib/MeshGenerators/ConvertRasterToMesh.h b/MeshLib/MeshGenerators/ConvertRasterToMesh.h index 0421b379fe7..42ffc4eeb00 100644 --- a/MeshLib/MeshGenerators/ConvertRasterToMesh.h +++ b/MeshLib/MeshGenerators/ConvertRasterToMesh.h @@ -19,7 +19,7 @@ #include "Raster.h" // MeshLib -#include "MshEnums.h" +#include "MeshEnums.h" namespace MeshLib { diff --git a/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp b/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp index 1ace613dc25..7386366bcc8 100644 --- a/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp +++ b/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp @@ -45,7 +45,7 @@ #include "Elements/Element.h" #include "Mesh.h" #include "MeshEditing/Mesh2MeshPropertyInterpolation.h" -#include "MshEnums.h" +#include "MeshEnums.h" int main (int argc, char* argv[]) { -- GitLab