Merge remote-tracking branch 'remotes/origin/EDF_2020_Lot2'

[modules/shaper.git] / src / SketchAPI / SketchAPI_Ellipse.h

diff --git a/src/SketchAPI/SketchAPI_Ellipse.h b/src/SketchAPI/SketchAPI_Ellipse.h
index ea6cee2a2beb6478eb9b139c28c9997bf0871db4..8f37ad6b033c695427ffabaee0163ae862ad0f26 100644 (file)
--- a/src/SketchAPI/SketchAPI_Ellipse.h
+++ b/src/SketchAPI/SketchAPI_Ellipse.h
@@ -61,7 +61,7 @@ public:
   /// Constructor with external.
   SKETCHAPI_EXPORT
   SketchAPI_Ellipse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                    const std::string& theExternalName);
+                    const std::wstring& theExternalName);
 
   /// Destructor.
   SKETCHAPI_EXPORT
@@ -107,7 +107,7 @@ public:
 
   /// Set by external name.
   SKETCHAPI_EXPORT
-  void setByExternalName(const std::string& theExternalName);
+  void setByExternalName(const std::wstring& theExternalName);
 
   /// Set center.
   SKETCHAPI_EXPORT
@@ -135,15 +135,15 @@ public:
   /// And the name of the feature shows that it is a regular feature.
   SKETCHAPI_EXPORT
   std::list<std::shared_ptr<SketchAPI_SketchEntity> > construction(
-      const std::string& center = std::string(),
-      const std::string& firstFocus = std::string(),
-      const std::string& secondFocus = std::string(),
-      const std::string& majorAxisStart = std::string(),
-      const std::string& majorAxisEnd = std::string(),
-      const std::string& minorAxisStart = std::string(),
-      const std::string& minorAxisEnd = std::string(),
-      const std::string& majorAxis = std::string(),
-      const std::string& minorAxis = std::string()) const;
+      const std::wstring& center = std::wstring(),
+      const std::wstring& firstFocus = std::wstring(),
+      const std::wstring& secondFocus = std::wstring(),
+      const std::wstring& majorAxisStart = std::wstring(),
+      const std::wstring& majorAxisEnd = std::wstring(),
+      const std::wstring& minorAxisStart = std::wstring(),
+      const std::wstring& minorAxisEnd = std::wstring(),
+      const std::wstring& majorAxis = std::wstring(),
+      const std::wstring& minorAxis = std::wstring()) const;
 
   /// Dump wrapped feature
   SKETCHAPI_EXPORT
@@ -175,15 +175,15 @@ private:
   static std::list<std::shared_ptr<SketchAPI_SketchEntity> > buildConstructionEntities(
       const FeaturePtr& theEllipse,
       const std::list<PairOfStrings>& theAttributes,
-      const std::string& theCenter,
-      const std::string& theFirstFocus,
-      const std::string& theSecondFocus,
-      const std::string& theMajorAxisStart,
-      const std::string& theMajorAxisEnd,
-      const std::string& theMinorAxisStart,
-      const std::string& theMinorAxisEnd,
-      const std::string& theMajorAxis,
-      const std::string& theMinorAxis);
+      const std::wstring& theCenter,
+      const std::wstring& theFirstFocus,
+      const std::wstring& theSecondFocus,
+      const std::wstring& theMajorAxisStart,
+      const std::wstring& theMajorAxisEnd,
+      const std::wstring& theMinorAxisStart,
+      const std::wstring& theMinorAxisEnd,
+      const std::wstring& theMajorAxis,
+      const std::wstring& theMinorAxis);
 
   friend class SketchAPI_EllipticArc;
 };