-#include "SMESH_*D_Algo.hxx"

+#include "SMESH_Algo.hxx"

diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx
index 4aefa321f83b07fdad073af4c7f8ef3ee9563147..df2228e3d7df7cd72aab25ab81f8669f535b8dc1 100644 (file)
--- a/src/StdMeshers/StdMeshers_Cartesian_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Cartesian_3D.hxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 /*!
  * \brief A 3D algorithm generating 3D structured Cartesian mesh in the

diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx
index d5b9f8b4e30eb5aeb1f92ea77d7e76361c8ce5ee..a39791e96d95ae2c8e2aaec00ac5d237c1a28340 100644 (file)
--- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.hxx
@@ -25,7 +25,7 @@
 #define _SMESH_CompositeSegment_1D_HXX_
 
 #include "SMESH_StdMeshers.hxx"
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 class SMESH_Mesh;
 class StdMeshers_FaceSide;

diff --git a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx
index 0912a4d030f5e12c3bc8711007239717ab97929a..16e70fc207ae9244a27ca6aa0acb875fe887b97d 100644 (file)
--- a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx
+++ b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx
@@ -25,7 +25,7 @@
 #define __StdMeshers_HexaFromSkin_3D_HXX__
 
 #include "SMESH_StdMeshers.hxx"
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 /*!
  * \brief Alorithm generating hexahedral mesh from 2D skin of block

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index 48f1eebbe8b08949ab2ef66ebf3e15a3373442c0..50b476c7dfc154df58cc3ed596ba7de434beb22d 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -31,7 +31,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 
 class StdMeshers_ViscousLayers;

diff --git a/src/StdMeshers/StdMeshers_Import_1D.hxx b/src/StdMeshers/StdMeshers_Import_1D.hxx
index b71b90564777f213a7aca26e3d0e46d13808f35e..03b8cbcf00fc75c06c0476b09a36b06e6d73f629 100644 (file)
--- a/src/StdMeshers/StdMeshers_Import_1D.hxx
+++ b/src/StdMeshers/StdMeshers_Import_1D.hxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_1D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMDS_MeshElement.hxx"
 
 class StdMeshers_ImportSource1D;

diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.hxx b/src/StdMeshers/StdMeshers_Import_1D2D.hxx
index fc3a89d8513569f034a92c973b136b7d161e5fe3..22dbed743e4555abb3f6ed55b5941d697f32441d 100644 (file)
--- a/src/StdMeshers/StdMeshers_Import_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_Import_1D2D.hxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMDS_MeshElement.hxx"
 
 class StdMeshers_ImportSource1D;

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
index fe637c65a1e82c2e345d8edde45da2a4f8b8e8b9..f7a91a6b1493044c04cfdced27d5a695522594ac 100644 (file)
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
@@ -51,8 +51,8 @@
 
 #include <BRepTools.hxx>
 #include <BRep_Tool.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom2d_Curve.hxx>
+#include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <Precision.hxx>
 #include <TopExp.hxx>
@@ -64,6 +64,7 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
+#include <TopoDS_Wire.hxx>
 #include <gp_Pnt2d.hxx>
 
 #include <BRep_Tool.hxx>

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
index 0dce86135ef9018c64a336dab7ec6f2ca6a87430..219df40890088fc1f82f799f186a1e0b3f0e6f06 100644 (file)
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
@@ -25,14 +25,13 @@
 //           Moved here from SMESH_MEFISTO_2D.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-//  $Header$
 //
 #ifndef _StdMeshers_MEFISTO_2D_HXX_
 #define _StdMeshers_MEFISTO_2D_HXX_
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 class TopoDS_Face;
 class StdMeshers_MaxElementArea;

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx
index 5d23368cc5f6a2659d59d6775e9c53817f5f927d..680389051b435f65e87986c2d1a7515d7ccf41a1 100644 (file)
--- a/src/StdMeshers/StdMeshers_Penta_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx
@@ -36,17 +36,17 @@
 //  class StdMeshers_SMESHBlock
 //
 ////////////////////////////////////////////////////////////////////////
+#include <TColStd_MapOfInteger.hxx>
+#include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TopoDS_Shell.hxx>
+#include <TopoDS_Vertex.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_XYZ.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopTools_IndexedMapOfOrientedShape.hxx>
-#include <TColStd_MapOfInteger.hxx>
 
+#include "SMESH_Algo.hxx"
 #include "SMESH_Block.hxx"
 #include "SMESH_ComputeError.hxx"
 #include "SMESH_MesherHelper.hxx"
-#include "SMESH_3D_Algo.hxx"
 
 typedef std::map< double, std::vector<const SMDS_MeshNode*> > StdMeshers_IJNodeMap;
 

diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx
index 8c1e6fa78fe629b3b29764f688def0a1ea0f2fd4..42d56fe16ccfc70961435677c61aac61ff17454c 100644 (file)
--- a/src/StdMeshers/StdMeshers_Prism_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx
@@ -29,25 +29,25 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_3D_Algo.hxx"
-#include "SMDS_TypeOfPosition.hxx"
 #include "SMDS_MeshNode.hxx"
+#include "SMDS_TypeOfPosition.hxx"
+#include "SMESHDS_Mesh.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMESH_Block.hxx"
+#include "SMESH_Comment.hxx"
 #include "SMESH_Mesh.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_subMesh.hxx"
 #include "SMESH_MesherHelper.hxx"
-#include "SMESH_Comment.hxx"
+#include "SMESH_subMesh.hxx"
 
 #include <vector>
 
+#include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <Adaptor2d_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <TopTools_IndexedMapOfOrientedShape.hxx>
-#include <gp_XYZ.hxx>
 #include <gp_Trsf.hxx>
+#include <gp_XYZ.hxx>
 
 
 class SMESHDS_SubMesh;
@@ -55,7 +55,6 @@ class TopoDS_Edge;
 class TopoDS_Faces;
 struct TNode;
 
-//typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
 typedef std::vector<const SMDS_MeshNode* > TNodeColumn;
 
 // map of bottom nodes to the column of nodes above them

diff --git a/src/StdMeshers/StdMeshers_Projection_1D.hxx b/src/StdMeshers/StdMeshers_Projection_1D.hxx
index 5ef640170fdda85077800be5b474ed9c3641bb56..acef6c83bf56f1c1f3caa7702dae199825c79f0b 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_1D.hxx
+++ b/src/StdMeshers/StdMeshers_Projection_1D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 
-#include "SMESH_1D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 
 class StdMeshers_ProjectionSource1D;

diff --git a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
index efe6bf034819dd7a5c7a696f65812988343d9b55..7e5cfe82181ca4f87276f0a52dc5fe1165b5a2b7 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
@@ -27,6 +27,7 @@
 
 #include "SMESH_Gen.hxx"
 #include "SMESH_MesherHelper.hxx"
+#include "SMESH_subMesh.hxx"
 #include "SMESH_subMeshEventListener.hxx"
 #include "StdMeshers_FaceSide.hxx"
 #include "StdMeshers_ProjectionSource2D.hxx"

diff --git a/src/StdMeshers/StdMeshers_Projection_2D.hxx b/src/StdMeshers/StdMeshers_Projection_2D.hxx
index 3d1bd1808e7b76336a3c2bc85760cf29e9839af2..38bcb113a9525a00b115041c0acf29239927c951 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Projection_2D.hxx
@@ -29,7 +29,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 class StdMeshers_ProjectionSource2D;
 

diff --git a/src/StdMeshers/StdMeshers_Projection_3D.hxx b/src/StdMeshers/StdMeshers_Projection_3D.hxx
index 03e8c4838a8382c48d4ea757e55fcb330be85b85..fdfe5b81799f12459a24d1d4164a05386b5bc480 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Projection_3D.hxx
@@ -29,7 +29,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 class StdMeshers_ProjectionSource3D;
 

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 3f9202e86dbe883584ec0db8a95bfdd6b2d7c1db..e200bc5af1b26554b27cb421fef6bfa220731499 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -31,7 +31,7 @@
 
 #include "StdMeshers_QuadrangleParams.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
 #include <TopoDS_Face.hxx>

diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
index 11959d46f8ec37819a60fa1124409469c0c3209f..7a6eaf9bdfc8d08fa241d410ebf2c38301942b7c 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
+++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.hxx
@@ -29,7 +29,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMDS_MeshNode.hxx"
 
 #include <vector>

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx
index b68ebe9302a88a5854dd786e187f40e0de63d66b..6a4def9e5b8a7cdd0c779642328b95946e8d3db1 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx
@@ -26,7 +26,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 #include <TopoDS_Edge.hxx>
 

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.hxx b/src/StdMeshers/StdMeshers_Regular_1D.hxx
index aed1064abee96b9c69bc7a08751e79813b668de9..8dceddb55106c36910b1226aeff0b85f69be8883 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.hxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.hxx
@@ -31,7 +31,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_1D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 #include "StdMeshers_FixedPoints1D.hxx"
 

diff --git a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx
index abb8ce2c665336f31b92bbdfba8eca2ef07c0e11..97d83042ee3f944c56f48c420fd69245e78c79ec 100644 (file)
--- a/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx
+++ b/src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx
@@ -29,7 +29,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_0D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 /*!
  * \brief Algorithm existing in order just to enable assignation of

diff --git a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
index 23c64b5b9191c12f7bbd3c7c426c5648168455a3..561036a4405aa7379796d75d0d17bfdb6e86180c 100644 (file)
--- a/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_UseExisting_1D2D.hxx
@@ -26,8 +26,7 @@
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_1D_Algo.hxx"
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 /*!
  * \brief 1D and 2D algorithms doing nothing to allow mesh generation