Task #3237: Allow usage of accented characters in ObjectBrowser

[modules/shaper.git] / src / ParametersPlugin / ParametersPlugin_EvalListener.cpp

diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
index dec451209fb63b72464cf6a32034456d0f7f889a..6f0efee2cbf92a3f47b100c2a90d0ad61a2959fb 100644 (file)
--- a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
@@ -24,6 +24,8 @@
 
 #include <Events_InfoMessage.h>
 
+#include <Locale_Convert.h>
+
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_AttributeRefList.h>
@@ -244,16 +246,16 @@ bool isValidAttribute(const AttributePtr& theAttribute)
 void setParameterName(ResultParameterPtr theResultParameter, const std::string& theName)
 {
   bool aWasBlocked = theResultParameter->data()->blockSendAttributeUpdated(true);
-  theResultParameter->data()->setName(ModelAPI_Tools::toWString(theName));
+  theResultParameter->data()->setName(Locale::Convert::toWString(theName));
   theResultParameter->data()->blockSendAttributeUpdated(aWasBlocked, false);
 
   std::shared_ptr<ParametersPlugin_Parameter> aParameter =
       std::dynamic_pointer_cast<ParametersPlugin_Parameter>(
           ModelAPI_Feature::feature(theResultParameter));
 
-  std::string anOldName = ModelAPI_Tools::toString(aParameter->name());
+  std::string anOldName = Locale::Convert::toString(aParameter->name());
   aWasBlocked = aParameter->data()->blockSendAttributeUpdated(true);
-  aParameter->data()->setName(ModelAPI_Tools::toWString(theName));
+  aParameter->data()->setName(Locale::Convert::toWString(theName));
   aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID())->setValue(theName);
   aParameter->data()->blockSendAttributeUpdated(aWasBlocked);
 }
@@ -295,28 +297,29 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent(
         ModuleBase_Tools::translate(aMsg),
         QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
     if (aRes != QMessageBox::Yes) {
-      setParameterName(aResultParameter, ModelAPI_Tools::toString(aMessage->oldName()));
+      setParameterName(aResultParameter, Locale::Convert::toString(aMessage->oldName()));
       return;
     }
   }
 
   // try to update the parameter feature according the new name
-  setParameterName(aResultParameter, ModelAPI_Tools::toString(aMessage->newName()));
+  setParameterName(aResultParameter, Locale::Convert::toString(aMessage->newName()));
   if (!isValidAttribute(aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID()))) {
     //setParameterName(aResultParameter, aMessage->oldName());
     if (myOldNames.find(aParameter.get()) == myOldNames.end())
-      myOldNames[aParameter.get()] = ModelAPI_Tools::toString(aMessage->oldName());
+      myOldNames[aParameter.get()] = Locale::Convert::toString(aMessage->oldName());
     return;
   }
 
-  std::string anOldName = ModelAPI_Tools::toString(aMessage->oldName());
+  std::string anOldName = Locale::Convert::toString(aMessage->oldName());
   if (myOldNames.find(aParameter.get()) != myOldNames.end()) {
     anOldName = myOldNames[aParameter.get()];
     myOldNames.erase(aParameter.get());
     aParameter->execute(); // to enable result because of previously incorrect name
   }
 
-  renameInDependents(aResultParameter, anOldName, ModelAPI_Tools::toString(aMessage->newName()));
+  renameInDependents(aResultParameter, anOldName,
+                     Locale::Convert::toString(aMessage->newName()));
 }
 
 void ParametersPlugin_EvalListener::processReplaceParameterEvent(
@@ -341,6 +344,7 @@ void ParametersPlugin_EvalListener::processReplaceParameterEvent(
   double aRealValue = aResultParameter->data()->real(ModelAPI_ResultParameter::VALUE())->value();
   std::string aValue = toStdString(aRealValue);
 
-  renameInDependents(aResultParameter, ModelAPI_Tools::toString(aResultParameter->data()->name()),
-    aValue);
+  renameInDependents(aResultParameter,
+                     Locale::Convert::toString(aResultParameter->data()->name()),
+                     aValue);
 }