Merge from BR_PORTING_VTK6 01/03/2013

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_ConvToQuadOp.cxx

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index a5575b8797bae2cfc2667da3d4755df98ca9817e..ff21b39e687efc1973b5af2b122e12e81e875ed4 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -193,7 +193,7 @@ void SMESHGUI_ConvToQuadOp::selectionDone()
 SUIT_SelectionFilter* SMESHGUI_ConvToQuadOp::createFilter( const int theId ) const
 {
   if ( theId == 0 )
-    return new SMESH_TypeFilter( MESHorSUBMESH );
+    return new SMESH_TypeFilter( SMESH::MESHorSUBMESH );
   else
     return 0;
 }
@@ -260,8 +260,8 @@ bool SMESHGUI_ConvToQuadOp::onApply()
           if ( myBadElemsPreview ) delete myBadElemsPreview; // viewWindow may change
           myBadElemsPreview = new SMESHGUI_MeshEditPreview( viewWindow() );
           
-          vtkFloatingPointType aPointSize = SMESH::GetFloat("SMESH:node_size",3);
-          vtkFloatingPointType aLineWidth = SMESH::GetFloat("SMESH:element_width",1);
+          double aPointSize = SMESH::GetFloat("SMESH:node_size",3);
+          double aLineWidth = SMESH::GetFloat("SMESH:element_width",1);
           vtkProperty* prop = vtkProperty::New();
           prop->SetLineWidth( aLineWidth * 3 );
           prop->SetPointSize( aPointSize * 3 );