Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / GeomDataAPI / GeomDataAPI_Point2D.h

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index c0eb001cfbbafe1a24dae931ac524364ca01b32e..3c67bec90d85c9e7a39cd68156b76c2db745c349 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomDataAPI_Point2D.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -5,7 +7,7 @@
 #ifndef GeomDataAPI_Point2D_H_
 #define GeomDataAPI_Point2D_H_
 
-#include "GeomDataAPI.h"
+#include <GeomDataAPI.h>
 #include <ModelAPI_Attribute.h>
 
 class GeomAPI_Pnt2d;
@@ -21,39 +23,31 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
   /// Defines the double value
   virtual void setValue(const double theX, const double theY) = 0;
   /// Defines the point
-  virtual void setValue(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint) = 0;
+  virtual void setValue(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint) = 0;
 
   /// Returns the X double value
   virtual double x() const = 0;
   /// Returns the Y double value
   virtual double y() const = 0;
   /// Returns the 2D point
-  virtual boost::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
+  virtual std::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
 
   /// Appends the delta values to point
-  void move(const double theDeltaX, const double theDeltaY)
-  {
-    setValue(x() + theDeltaX, y() + theDeltaY);
-  }
-
+  GEOMDATAAPI_EXPORT void move(const double theDeltaX, const double theDeltaY);
 
   /// Returns the type of this class of attributes
-  static inline std::string type()
+  static std::string typeId()
   {
     return std::string("Point2D");
   }
 
   /// Returns the type of this class of attributes, not static method
-  virtual std::string attributeType()
-  {
-    return type();
-  }
+  GEOMDATAAPI_EXPORT virtual std::string attributeType();
 
  protected:
   /// Objects are created for features automatically
-  GeomDataAPI_Point2D()
-  {
-  }
+  GEOMDATAAPI_EXPORT GeomDataAPI_Point2D();
+  GEOMDATAAPI_EXPORT virtual ~GeomDataAPI_Point2D();
 };
 
 #endif