OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0024814: Avoid using explicit names of Handle classes

Browse Source 
Sources corrected replacing Handle_XXX by Handle(XXX)
This commit is contained in:
abv
2014-04-09 18:48:28 +04:00
parent 6fc9d72d9d
commit 857ffd5e57
211 changed files with 697 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
View File

@@ -25,27 +25,27 @@
* and the corresponding Appearance.
*/
class VrmlData_DataMapOfShapeAppearance
: public NCollection_DataMap<Handle_TopoDS_TShape, Handle_VrmlData_Appearance>
: public NCollection_DataMap<Handle(TopoDS_TShape), Handle(VrmlData_Appearance)>
{
public:
//! Constructor
inline VrmlData_DataMapOfShapeAppearance
(const Standard_Integer NbBuckets=1,
const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
: NCollection_DataMap<Handle_TopoDS_TShape,
Handle_VrmlData_Appearance> (NbBuckets, theAllocator)
: NCollection_DataMap<Handle(TopoDS_TShape),
Handle(VrmlData_Appearance)> (NbBuckets, theAllocator)
{}
//! Copy constructor
inline VrmlData_DataMapOfShapeAppearance
(const VrmlData_DataMapOfShapeAppearance& theOther)
: NCollection_DataMap<Handle_TopoDS_TShape,
Handle_VrmlData_Appearance> (theOther)
: NCollection_DataMap<Handle(TopoDS_TShape),
Handle(VrmlData_Appearance)> (theOther)
{}
friend Standard_Boolean IsEqual (const Handle_TopoDS_TShape& one,
const Handle_TopoDS_TShape& two);
friend Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one,
const Handle(TopoDS_TShape)& two);
};
@@ -53,8 +53,8 @@ public:
//function : IsEqual
//purpose : for NCollection_DataMap interface
//=======================================================================
inline Standard_Boolean IsEqual (const Handle_TopoDS_TShape& one,
const Handle_TopoDS_TShape& two)
inline Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one,
const Handle(TopoDS_TShape)& two)
{
return one == two;
}

2
src/VrmlData/VrmlData_ListOfNode.hxx
View File

@@ -23,6 +23,6 @@
* Container of List type, holding handles to VrmlData_Node objects
*/
typedef NCollection_List<Handle_VrmlData_Node> VrmlData_ListOfNode;
typedef NCollection_List<Handle(VrmlData_Node)> VrmlData_ListOfNode;
#endif

2
src/VrmlData/VrmlData_MapOfNode.hxx
View File

@@ -23,6 +23,6 @@
* Container of Map type, holding handles to VrmlData_Node objects
*/
typedef NCollection_Map<Handle_VrmlData_Node> VrmlData_MapOfNode;
typedef NCollection_Map<Handle(VrmlData_Node)> VrmlData_MapOfNode;
#endif

4
src/VrmlData/VrmlData_Node.hxx
View File

@@ -30,7 +30,7 @@ struct VrmlData_InBuffer;
class VrmlData_Scene;
class gp_XY;
class gp_XYZ;
class Handle_VrmlData_Node;
class Handle(VrmlData_Node);
class TCollection_AsciiString;
/**
@@ -202,7 +202,7 @@ class VrmlData_Node : public Standard_Transient
// Definition of HANDLE object using Standard_DefineHandle.hxx
DEFINE_STANDARD_HANDLE (VrmlData_Node, Standard_Transient)
Standard_EXPORT Standard_Integer HashCode(const Handle_VrmlData_Node& theNode,
Standard_EXPORT Standard_Integer HashCode(const Handle(VrmlData_Node)& theNode,
const Standard_Integer theUpper);
Standard_EXPORT Standard_Boolean IsEqual (const Handle(VrmlData_Node)& theOne,
const Handle(VrmlData_Node)& theTwo);

2
src/VrmlData/VrmlData_Scene.cxx
View File

@@ -185,7 +185,7 @@ void VrmlData_Scene::SetVrmlDir (const TCollection_ExtendedString& theDir)
//purpose :
//=======================================================================
const Handle_VrmlData_WorldInfo& VrmlData_Scene::WorldInfo() const
const Handle(VrmlData_WorldInfo)& VrmlData_Scene::WorldInfo() const
{
return myWorldInfo;
}

10
src/VrmlData/VrmlData_Scene.hxx
View File

@@ -28,7 +28,7 @@
#include <Standard_Mutex.hxx>
struct VrmlData_InBuffer;
class Handle_VrmlData_WorldInfo;
class Handle(VrmlData_WorldInfo);
class VrmlData_DataMapOfShapeAppearance;
/**
@@ -182,7 +182,7 @@ class VrmlData_Scene
/**
* Query the WorldInfo member.
*/
Standard_EXPORT const Handle_VrmlData_WorldInfo&
Standard_EXPORT const Handle(VrmlData_WorldInfo)&
WorldInfo() const;
/**
@@ -314,7 +314,7 @@ class VrmlData_Scene
*/
Standard_EXPORT VrmlData_ErrorStatus
WriteNode (const char * thePrefix,
const Handle_VrmlData_Node&) const;
const Handle(VrmlData_Node)&) const;
/**
* Query if the current write operation is dummy, i.e., for the purpose of
@@ -371,8 +371,8 @@ class VrmlData_Scene
VrmlData_ListOfNode myLstNodes; ///! top-level nodes
VrmlData_ListOfNode myAllNodes; ///! all nodes
VrmlData_ErrorStatus myStatus;
Handle_NCollection_IncAllocator myAllocator;
Handle_VrmlData_WorldInfo myWorldInfo;
Handle(NCollection_IncAllocator) myAllocator;
Handle(VrmlData_WorldInfo) myWorldInfo;
VrmlData_MapOfNode myNamedNodes;
// read from stream

10
src/VrmlData/VrmlData_ShapeConvert.cxx
View File

@@ -330,10 +330,10 @@ void VrmlData_ShapeConvert::Convert (const Standard_Boolean theExtractFaces,
//purpose :
//=======================================================================
Handle_VrmlData_Geometry VrmlData_ShapeConvert::triToIndexedFaceSet
(const Handle_Poly_Triangulation& theTri,
Handle(VrmlData_Geometry) VrmlData_ShapeConvert::triToIndexedFaceSet
(const Handle(Poly_Triangulation)& theTri,
const TopoDS_Face& theFace,
const Handle_VrmlData_Coordinate& theCoord)
const Handle(VrmlData_Coordinate)& theCoord)
{
Standard_Integer i;
const Standard_Integer nNodes (theTri->NbNodes());
@@ -486,8 +486,8 @@ Handle_VrmlData_Geometry VrmlData_ShapeConvert::triToIndexedFaceSet
//purpose : single polygon3D => IndexedLineSet
//=======================================================================
Handle_VrmlData_Geometry VrmlData_ShapeConvert::polToIndexedLineSet
(const Handle_Poly_Polygon3D& thePol)
Handle(VrmlData_Geometry) VrmlData_ShapeConvert::polToIndexedLineSet
(const Handle(Poly_Polygon3D)& thePol)
{
Standard_Integer i;
const Standard_Integer nNodes (thePol->NbNodes());

20
src/VrmlData/VrmlData_ShapeConvert.hxx
View File

@@ -23,9 +23,9 @@
class VrmlData_Scene;
class TopoDS_Face;
class Handle_Poly_Triangulation;
class Handle_Poly_Polygon3D;
class Handle_VrmlData_Coordinate;
class Handle(Poly_Triangulation);
class Handle(Poly_Polygon3D);
class Handle(VrmlData_Coordinate);
/**
* Algorithm converting one shape or a set of shapes to VrmlData_Scene.
*/
@@ -87,17 +87,17 @@ class VrmlData_ShapeConvert
protected:
// ---------- PROTECTED METHODS ----------
Handle_VrmlData_Geometry triToIndexedFaceSet
(const Handle_Poly_Triangulation&,
Handle(VrmlData_Geometry) triToIndexedFaceSet
(const Handle(Poly_Triangulation)&,
const TopoDS_Face&,
const Handle_VrmlData_Coordinate&);
const Handle(VrmlData_Coordinate)&);
Handle_VrmlData_Geometry polToIndexedLineSet
(const Handle_Poly_Polygon3D&);
Handle(VrmlData_Geometry) polToIndexedLineSet
(const Handle(Poly_Polygon3D)&);
Handle_VrmlData_Appearance defaultMaterialFace () const;
Handle(VrmlData_Appearance) defaultMaterialFace () const;
Handle_VrmlData_Appearance defaultMaterialEdge () const;
Handle(VrmlData_Appearance) defaultMaterialEdge () const;
private:
// ---------- PRIVATE FIELDS ----------