Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Entity.cxx
diff --git
a/src/HYDROData/HYDROData_Entity.cxx
b/src/HYDROData/HYDROData_Entity.cxx
index 5a055f78e16909bbbd011e2e5e8a0a9c8f8ebb6c..e5baa747adbcae0b0b23c6200e7f8644d4bb6c39 100644
(file)
--- a/
src/HYDROData/HYDROData_Entity.cxx
+++ b/
src/HYDROData/HYDROData_Entity.cxx
@@
-43,25
+43,24
@@
#include "HYDRO_trace.hxx"
HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects()
#include "HYDRO_trace.hxx"
HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects()
- : NCollection_Sequence<Handle
_HYDROData_Entity
>()
+ : NCollection_Sequence<Handle
(HYDROData_Entity)
>()
{
}
HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& theSequence )
{
}
HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& theSequence )
- : NCollection_Sequence<Handle
_HYDROData_Entity
>( theSequence )
+ : NCollection_Sequence<Handle
(HYDROData_Entity)
>( theSequence )
{
}
{
}
-HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle
_HYDROData_Entity
>& theSequence )
- : NCollection_Sequence<Handle
_HYDROData_Entity
>( theSequence )
+HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle
(HYDROData_Entity)
>& theSequence )
+ : NCollection_Sequence<Handle
(HYDROData_Entity)
>( theSequence )
{
}
{
}
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Entity,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared)
// is equal function for unique object mapping
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared)
// is equal function for unique object mapping
-bool IsEqual(const Handle
_HYDROData_Entity& theObj1, const Handle_HYDROData_Entity
& theObj2)
+bool IsEqual(const Handle
(HYDROData_Entity)& theObj1, const Handle(HYDROData_Entity)
& theObj2)
{
if ( !theObj1.IsNull() && !theObj2.IsNull() )
return theObj1->Label() == theObj2->Label();
{
if ( !theObj1.IsNull() && !theObj2.IsNull() )
return theObj1->Label() == theObj2->Label();
@@
-303,7
+302,7
@@
HYDROData_SequenceOfObjects HYDROData_Entity::GetAllReferenceObjects() const
return HYDROData_SequenceOfObjects();
}
return HYDROData_SequenceOfObjects();
}
-
Standard_Boolean
HYDROData_Entity::GetZLevel( Standard_Integer& theLevel ) const
+
bool
HYDROData_Entity::GetZLevel( Standard_Integer& theLevel ) const
{
theLevel = -1;
{
theLevel = -1;
@@
-314,11
+313,11
@@
Standard_Boolean HYDROData_Entity::GetZLevel( Standard_Integer& theLevel ) const
if ( aLabel.FindAttribute( TDataStd_Integer::GetID(), anIntVal ) )
{
theLevel = anIntVal->Get();
if ( aLabel.FindAttribute( TDataStd_Integer::GetID(), anIntVal ) )
{
theLevel = anIntVal->Get();
- return
Standard_T
rue;
+ return
t
rue;
}
}
}
}
- return
Standard_F
alse;
+ return
f
alse;
}
void HYDROData_Entity::SetZLevel( const Standard_Integer& theLevel )
}
void HYDROData_Entity::SetZLevel( const Standard_Integer& theLevel )
@@
-383,7
+382,7
@@
int HYDROData_Entity::NbReferenceObjects( const int theTag ) const
return aRefs.IsNull() ? 0 : aRefs->Extent();
}
return aRefs.IsNull() ? 0 : aRefs->Extent();
}
-bool HYDROData_Entity::HasReference( const Handle
_HYDROData_Entity
& theObj,
+bool HYDROData_Entity::HasReference( const Handle
(HYDROData_Entity)
& theObj,
const int theTag ) const
{
if ( theObj.IsNull() )
const int theTag ) const
{
if ( theObj.IsNull() )
@@
-404,7
+403,7
@@
bool HYDROData_Entity::HasReference( const Handle_HYDROData_Entity& theObj,
return false;
}
return false;
}
-void HYDROData_Entity::AddReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+void HYDROData_Entity::AddReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag )
{
if ( theObj.IsNull() )
const int theTag )
{
if ( theObj.IsNull() )
@@
-414,7
+413,7
@@
void HYDROData_Entity::AddReferenceObject( const Handle_HYDROData_Entity& theObj
aRefs->Append( theObj->Label() );
}
aRefs->Append( theObj->Label() );
}
-void HYDROData_Entity::SetReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+void HYDROData_Entity::SetReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag,
const int theIndex )
{
const int theTag,
const int theIndex )
{
@@
-448,7
+447,7
@@
void HYDROData_Entity::SetReferenceObject( const Handle_HYDROData_Entity& theObj
}
}
}
}
-void HYDROData_Entity::InsertReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+void HYDROData_Entity::InsertReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag,
const int theBeforeIndex )
{
const int theTag,
const int theBeforeIndex )
{