OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +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

2
src/NCollection/NCollection_BaseCollection.hxx
View File

@@ -105,7 +105,7 @@ template<class TheItemType> class NCollection_BaseCollection
const Handle(NCollection_BaseAllocator)& IterAllocator(void) const
{
if (myIterAllocator.IsNull())
(Handle_NCollection_BaseAllocator&) myIterAllocator =
(Handle(NCollection_BaseAllocator)&) myIterAllocator =
new NCollection_IncAllocator(64);
return myIterAllocator;
}

6
src/NCollection/NCollection_Handle.hxx
View File

@@ -44,7 +44,7 @@ Standard_EXPORT const Handle(Standard_Type)& STANDARD_TYPE(NCollection_Handle);
//! }
template <class T>
class NCollection_Handle : public Handle_Standard_Transient
class NCollection_Handle : public Handle(Standard_Transient)
{
private:
@@ -73,7 +73,7 @@ class NCollection_Handle : public Handle_Standard_Transient
//! Note that additional argument is used to avoid ambiguity with
//! public constructor from pointer when Handle is intilialized by 0.
NCollection_Handle (Ptr* thePtr, int)
: Handle_Standard_Transient (thePtr) {}
: Handle(Standard_Transient) (thePtr) {}
public:
@@ -84,7 +84,7 @@ class NCollection_Handle : public Handle_Standard_Transient
//! Constructor of handle from pointer on newly allocated object
NCollection_Handle (T* theObject)
: Handle_Standard_Transient (theObject ? new Ptr (theObject) : 0) {}
: Handle(Standard_Transient) (theObject ? new Ptr (theObject) : 0) {}
//! Cast handle to contained type
T* operator -> () { return ((Ptr*)ControlAccess())->myPtr; }

2
src/NCollection/NCollection_HeapAllocator.cxx
View File

@@ -54,7 +54,7 @@ void NCollection_HeapAllocator::Free (void * anAddress)
//purpose :
//=======================================================================
const Handle_NCollection_HeapAllocator&
const Handle(NCollection_HeapAllocator)&
NCollection_HeapAllocator::GlobalHeapAllocator()
{
static Handle(NCollection_HeapAllocator) pAllocator;

4
src/NCollection/NCollection_HeapAllocator.hxx
View File

@@ -18,7 +18,7 @@
#include <NCollection_BaseAllocator.hxx>
class Handle_NCollection_HeapAllocator;
class Handle(NCollection_HeapAllocator);
/**
* Allocator that uses the global dynamic heap (malloc / free).
@@ -31,7 +31,7 @@ class NCollection_HeapAllocator : public NCollection_BaseAllocator
Standard_EXPORT virtual void* Allocate (const Standard_Size theSize);
Standard_EXPORT virtual void Free (void * anAddress);
Standard_EXPORT static const Handle_NCollection_HeapAllocator&
Standard_EXPORT static const Handle(NCollection_HeapAllocator)&
GlobalHeapAllocator();
protected:

2
src/NCollection/NCollection_StdBase.hxx
View File

@@ -32,6 +32,6 @@ DEFINE_BASECOLLECTION(NCollection_BaseCollAsciiString ,
DEFINE_BASECOLLECTION(NCollection_BaseCollExtendedString,
TCollection_ExtendedString)
DEFINE_BASECOLLECTION(NCollection_BaseCollTransient ,
Handle_Standard_Transient)
Handle(Standard_Transient))
#endif

2
src/NCollection/NCollection_UBTree.hxx
View File

@@ -449,7 +449,7 @@ class _HUBTREE : public _HPARENT \
\
_HUBTREE () : myTree(new UBTree) {} \
/* Empty constructor */ \
_HUBTREE (const Handle_NCollection_BaseAllocator& theAlloc) \
_HUBTREE (const Handle(NCollection_BaseAllocator)& theAlloc) \
: myTree(new UBTree(theAlloc)) {} \
/* Constructor */ \
\

2
src/NCollection/NCollection_UBTreeFiller.hxx
View File

@@ -66,7 +66,7 @@ template <class TheObjType, class TheBndType> class NCollection_UBTreeFiller
* the tree filling is faster due to better utilisation of CPU L1/L2 cache.
*/
NCollection_UBTreeFiller (UBTree& theTree,
const Handle_NCollection_BaseAllocator& theAlloc=0L,
const Handle(NCollection_BaseAllocator)& theAlloc=0L,
const Standard_Boolean isFullRandom = Standard_True)
: myTree(theTree), mySeqPtr(1000, theAlloc),
mySeed(1), myIsFullRandom (isFullRandom)

2
src/NCollection/NCollection_Vector.hxx
View File

@@ -108,7 +108,7 @@ public: //! @name public methods
//! Constructor
NCollection_Vector (const Standard_Integer theIncrement = 256,
const Handle_NCollection_BaseAllocator& theAlloc = NULL)
const Handle(NCollection_BaseAllocator)& theAlloc = NULL)
: NCollection_BaseCollection<TheItemType> (theAlloc),
NCollection_BaseVector (NCollection_BaseCollection<TheItemType>::myAllocator, initMemBlocks, sizeof(TheItemType), theIncrement) {}