Merge from V6_main 13/12/2012

[modules/smesh.git] / src / StdMeshers / StdMeshers_Quadrangle_2D.hxx

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index e200bc5af1b26554b27cb421fef6bfa220731499..000c01f66103b74908cec7eacb1abe52e68ac604 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -27,19 +27,18 @@
 #ifndef _SMESH_QUADRANGLE_2D_HXX_
 #define _SMESH_QUADRANGLE_2D_HXX_
 
+#include "SMESH_Algo.hxx"
+#include "SMESH_ProxyMesh.hxx"
 #include "SMESH_StdMeshers.hxx"
-
 #include "StdMeshers_QuadrangleParams.hxx"
 
-#include "SMESH_Algo.hxx"
-#include "Utils_SALOME_Exception.hxx"
-
 #include <TopoDS_Face.hxx>
 
+class SMDS_MeshNode;
 class SMESH_Mesh;
 class SMESH_MesherHelper;
+class SMESH_ProxyMesh;
 class StdMeshers_FaceSide;
-class SMDS_MeshNode;
 struct uvPtStruct;
 
 
@@ -124,13 +123,15 @@ protected:
 
   bool myTrianglePreference;
 
-  int myTriaVertexID;
+  int  myTriaVertexID;
+
+  bool myNeedSmooth;
 
-  StdMeshers_QuadType myQuadType;
+  StdMeshers_QuadType  myQuadType;
 
-  SMESH_MesherHelper* myHelper; // tool for working with quadratic elements
+  SMESH_MesherHelper*  myHelper; // tool for working with quadratic elements
 
-  bool myNeedSmooth;
+  SMESH_ProxyMesh::Ptr myProxyMesh;
 };
 
 #endif