X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetNameEdit.cpp;h=5a3a3bfbf84203cb37e35bdb602e7f7f75266ae4;hb=374a366d81778aa27ed32cc080c0f95bdb03f1c5;hp=9684eb79b60f615134c20408953463740965206d;hpb=214434b3f4710b32a3a03c8148cc61ed777e4677;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetNameEdit.cpp b/src/ModuleBase/ModuleBase_WidgetNameEdit.cpp index 9684eb79b..5a3a3bfbf 100644 --- a/src/ModuleBase/ModuleBase_WidgetNameEdit.cpp +++ b/src/ModuleBase/ModuleBase_WidgetNameEdit.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 "ModuleBase_WidgetNameEdit.h" @@ -24,17 +23,6 @@ #include -ModuleBase_WidgetNameEdit::ModuleBase_WidgetNameEdit(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& thePlaceHolder ) - : ModuleBase_WidgetLineEdit(theParent, theData, thePlaceHolder) -{ - // Disconnect the signal in order to avoid Apply button activation automatically - // it will activate apply because of value isApplyEnabledByActiveWidget in - // XGUI_ErrorMgr::updateActions - disconnect(myLineEdit, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified())); -} - bool ModuleBase_WidgetNameEdit::storeValueCustom() { @@ -42,7 +30,7 @@ bool ModuleBase_WidgetNameEdit::storeValueCustom() return false; QString aValue = myLineEdit->text(); - std::string aName = aValue.toStdString(); + std::wstring aName = aValue.toStdWString(); myFeature->data()->setName(aName); ResultPtr aRes = myFeature->firstResult(); if (aRes.get()) @@ -57,7 +45,7 @@ bool ModuleBase_WidgetNameEdit::restoreValueCustom() return false; bool isBlocked = myLineEdit->blockSignals(true); - myLineEdit->setText(QString::fromStdString(myFeature->data()->name())); + myLineEdit->setText(QString::fromStdWString(myFeature->data()->name())); myLineEdit->blockSignals(isBlocked); return true;