Merge remote-tracking branch 'origin/master' into gni/documentation

[modules/shaper.git] / src / Model / Model_AttributeInteger.cpp

diff --git a/src/Model/Model_AttributeInteger.cpp b/src/Model/Model_AttributeInteger.cpp
index cd939550bb9cb1a2ca21bc976342351f082a5f55..d4948e1399d199428510ac5852954913cef58a4b 100644 (file)
--- a/src/Model/Model_AttributeInteger.cpp
+++ b/src/Model/Model_AttributeInteger.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <Model_AttributeInteger.h>
@@ -56,7 +55,7 @@ int Model_AttributeInteger::value()
   return myExpression->value();
 }
 
-void Model_AttributeInteger::setText(const std::string& theValue)
+void Model_AttributeInteger::setText(const std::wstring& theValue)
 {
   if (text() != theValue) {
     myExpression->setText(theValue);
@@ -66,7 +65,7 @@ void Model_AttributeInteger::setText(const std::string& theValue)
   }
 }
 
-std::string Model_AttributeInteger::text()
+std::wstring Model_AttributeInteger::text()
 {
   return myExpression->text();
 }
@@ -92,12 +91,12 @@ std::string Model_AttributeInteger::expressionError()
   return myExpression->error();
 }
 
-void Model_AttributeInteger::setUsedParameters(const std::set<std::string>& theUsedParameters)
+void Model_AttributeInteger::setUsedParameters(const std::set<std::wstring>& theUsedParameters)
 {
   myExpression->setUsedParameters(theUsedParameters);
 }
 
-std::set<std::string> Model_AttributeInteger::usedParameters() const
+std::set<std::wstring> Model_AttributeInteger::usedParameters() const
 {
   return myExpression->usedParameters();
 }