X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFeatureSelector.cpp;h=36888335c55991e2fa6082ab10beac6213e16f21;hb=aba714fbb23139b15272ed816c9a30595165106c;hp=aeebdfa1e81af6de738978d89718fdc9d12e942b;hpb=6b17a8de4d7b8b401c8e04c41dad05a37e1c6ee3;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp b/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp index aeebdfa1e..36888335c 100644 --- a/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2021 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -99,7 +98,6 @@ ModuleBase_WidgetFeatureSelector::~ModuleBase_WidgetFeatureSelector() //******************************************************************** bool ModuleBase_WidgetFeatureSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - ModuleBase_ISelection* aSelection = myWorkshop->selection(); ObjectPtr anObject = ModelAPI_Feature::feature(thePrs->object()); GeomShapePtr aShape; @@ -185,8 +183,8 @@ void ModuleBase_WidgetFeatureSelector::updateSelectionName() ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID())); if (anObject.get() != NULL) { - std::string aName = anObject->data()->name(); - myTextLine->setText(QString::fromStdString(aName)); + std::wstring aName = anObject->data()->name(); + myTextLine->setText(QString::fromStdWString(aName)); } else { myTextLine->clear(); }