Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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>
#include <string>
#include <boost/shared_ptr.hpp>
-class ModelAPI_
Feature
;
+class ModelAPI_
Object
;
/**\class ModelAPI_Attribute
* \ingroup DataModel
/**\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
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:
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 virtual ~ModelAPI_Attribute() {}
/// Sets the owner of this attribute
- MODELAPI_EXPORT void set
Feature(const boost::shared_ptr<ModelAPI_Feature>& theFeature
)
- {my
Feature = theFeature
;}
+ MODELAPI_EXPORT void set
Object(const boost::shared_ptr<ModelAPI_Object>& theObject
)
+ {my
Object = theObject
;}
/// Returns the owner of this attribute
/// Returns the owner of this attribute
- MODELAPI_EXPORT const boost::shared_ptr<ModelAPI_
Feature
>& owner()
- {return my
Feature
;}
+ MODELAPI_EXPORT const boost::shared_ptr<ModelAPI_
Object
>& owner()
+ {return my
Object
;}
/// Returns true if attribute was initialized by some value
MODELAPI_EXPORT bool isInitialized() {return myIsInitialized;}
/// Returns true if attribute was initialized by some value
MODELAPI_EXPORT bool isInitialized() {return myIsInitialized;}