Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / ModelAPI / ModelAPI_Attribute.h

diff --git a/src/ModelAPI/ModelAPI_Attribute.h b/src/ModelAPI/ModelAPI_Attribute.h
index 4a15abb88c718b680beeff2b45d323c3020426e2..55cbb7cfd9c1d8fc82b2c3ee3ccff5980db91c46 100644 (file)
--- a/src/ModelAPI/ModelAPI_Attribute.h
+++ b/src/ModelAPI/ModelAPI_Attribute.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-class ModelAPI_Feature;
+class ModelAPI_Object;
 
 /**\class ModelAPI_Attribute
  * \ingroup DataModel
@@ -18,7 +18,7 @@ class ModelAPI_Feature;
 class ModelAPI_Attribute
 {
   ///< needed here to emit signal that feature changed on change of the attribute
-  boost::shared_ptr<ModelAPI_Feature> myFeature;
+  boost::shared_ptr<ModelAPI_Object> myObject;
 protected: // accessible from the attributes
   bool myIsInitialized;
 public:
@@ -30,12 +30,12 @@ public:
   MODELAPI_EXPORT virtual ~ModelAPI_Attribute() {}
 
   /// Sets the owner of this attribute
-  MODELAPI_EXPORT void setFeature(const boost::shared_ptr<ModelAPI_Feature>& theFeature)
-    {myFeature = theFeature;}
+  MODELAPI_EXPORT void setObject(const boost::shared_ptr<ModelAPI_Object>& theObject)
+    {myObject = theObject;}
 
   /// Returns the owner of this attribute
-  MODELAPI_EXPORT const boost::shared_ptr<ModelAPI_Feature>& owner()
-  {return myFeature;}
+  MODELAPI_EXPORT const boost::shared_ptr<ModelAPI_Object>& owner()
+  {return myObject;}
 
   /// Returns true if attribute was  initialized by some value
   MODELAPI_EXPORT bool isInitialized() {return myIsInitialized;}