X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SelectionOp.cxx;h=c84dd447eb79f928b31009bdc638139c21eaacdc;hb=d90a581cefcc55423f12edd390bd91118a4a6b0c;hp=ed560b87ee5400108f0be8733d2db59ea87be068;hpb=10191484fe88a27e962b8e4b57e09d390d8705c7;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx index ed560b87e..c84dd447e 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -195,7 +195,7 @@ void SMESHGUI_SelectionOp::onActivateObject( int id ) // name : onDeactivateObject // purpose : //================================================================================= -void SMESHGUI_SelectionOp::onDeactivateObject( int id ) +void SMESHGUI_SelectionOp::onDeactivateObject( int /*id*/ ) { removeCustomFilters(); } @@ -250,11 +250,11 @@ void SMESHGUI_SelectionOp::setSelectionMode( const Selection_Mode mode ) // Purpose : Highlight object in 3d viewer //======================================================================= void SMESHGUI_SelectionOp::highlight( const Handle( SALOME_InteractiveObject )& obj, - const bool hilight, const bool immediately ) + const bool highlight, const bool immediately ) { SVTK_ViewWindow* wnd = viewWindow(); if( wnd ) - wnd->highlight( obj, hilight, immediately ); + wnd->highlight( obj, highlight, immediately ); } //======================================================================= @@ -304,7 +304,7 @@ int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype if( t<0 ) { //try to get GEOM type - _PTR( SObject ) sobj = aStudy->FindObjectID( str.toLatin1().data() ); + _PTR( SObject ) sobj = aStudy->FindObjectID( str.toUtf8().data() ); if( sobj ) { GEOM::GEOM_Object_var obj = GEOM::GEOM_Object::_narrow( @@ -327,7 +327,7 @@ int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype int id = _id.toInt( &ok ); if( ok ) { - _PTR( SObject ) sobj = aStudy->FindObjectID( entry.toLatin1().data() ); + _PTR( SObject ) sobj = aStudy->FindObjectID( entry.toUtf8().data() ); SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( dynamic_cast( sobj.get() )->GetObject() ); SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(