Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / GeomData / GeomData_Point.h

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index dbb6baf4510285fbeae520e2284a995a152670f7..1aa3e967487bd4174123fad2fd77110ac275d86f 100644 (file)
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  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
 //
 
 #ifndef GeomData_Point_H_
@@ -64,22 +63,22 @@ class GeomData_Point : public GeomDataAPI_Point
     void setCalculatedValue(const double theX, const double theY, const double theZ);
 
   /// Defines the text values
-  GEOMDATA_EXPORT virtual void setText(const std::string& theX,
-                                       const std::string& theY,
-                                       const std::string& theZ);
+  GEOMDATA_EXPORT virtual void setText(const std::wstring& theX,
+                                       const std::wstring& theY,
+                                       const std::wstring& theZ);
   /// Defines the X text value
-  GEOMDATA_EXPORT virtual void setTextX(const std::string& theX);
+  GEOMDATA_EXPORT virtual void setTextX(const std::wstring& theX);
   /// Defines the Y text value
-  GEOMDATA_EXPORT virtual void setTextY(const std::string& theY);
+  GEOMDATA_EXPORT virtual void setTextY(const std::wstring& theY);
   /// Defines the Z text value
-  GEOMDATA_EXPORT virtual void setTextZ(const std::string& theZ);
+  GEOMDATA_EXPORT virtual void setTextZ(const std::wstring& theZ);
 
   /// Returns the X text value
-  GEOMDATA_EXPORT virtual std::string textX();
+  GEOMDATA_EXPORT virtual std::wstring textX();
   /// Returns the Y text value
-  GEOMDATA_EXPORT virtual std::string textY();
+  GEOMDATA_EXPORT virtual std::wstring textY();
   /// Returns the Z text value
-  GEOMDATA_EXPORT virtual std::string textZ();
+  GEOMDATA_EXPORT virtual std::wstring textZ();
 
   /// Allows to set expression (text) as invalid (by the parameters listener)
   GEOMDATA_EXPORT virtual void setExpressionInvalid(int, const bool theFlag);
@@ -95,10 +94,10 @@ class GeomData_Point : public GeomDataAPI_Point
 
   /// Defines the used parameters
   GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent,
-    const std::set<std::string>& theUsedParameters);
+    const std::set<std::wstring>& theUsedParameters);
 
   /// Returns the used parameters
-  GEOMDATA_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const;
+  GEOMDATA_EXPORT virtual std::set<std::wstring> usedParameters(int theComponent) const;
 
  protected:
   /// Initializes attributes