Merge branch 'master' into gni/evolution

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_QuadrangleParamWdg.cxx

diff --git a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
index aa04fa8c4278f4ec3f6a6ec0f6d30c7123ba5c4e..3aa7a33085f621907feb8341fd711ef247ceb11f 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -288,9 +288,7 @@ QString  StdMeshersGUI_QuadrangleParamCreator::storeParams() const
   {
     QListWidgetItem* item = myShapesList->item(i);
     QString         entry = item->data( Qt::UserRole ).toString();
-    Handle(SALOME_InteractiveObject) io =
-      new SALOME_InteractiveObject( entry.toStdString().c_str(), "GEOM" );
-    GEOM::GEOM_Object_var go = GEOMBase::ConvertIOinGEOMObject( io );
+    GEOM::GEOM_Object_var go = SMESH::EntryToInterface<GEOM::GEOM_Object>( entry );
     if ( !go->_is_nil() )
       goList[ nbShapes++ ] = go;
   }
@@ -501,8 +499,8 @@ ItemDelegate::ItemDelegate( QObject* parent ) : QItemDelegate( parent )
 */
 QWidget* StdMeshersGUI_QuadrangleParamCreator::
 ItemDelegate::createEditor( QWidget*                    parent,
-                            const QStyleOptionViewItem& option,
-                            const QModelIndex&          index ) const
+                            const QStyleOptionViewItem& /*option*/,
+                            const QModelIndex&          /*index*/ ) const
 {
   SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent );
   sb->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10 );