Show
Ignore:
Timestamp:
05/05/08 07:12:19 (4 months ago)
Author:
vossg
Message:

changed: interface cleanup, removed ptr typedefs, nullfc

these will be needed for the 1.x compat stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/System/FieldContainer/Misc/OSGContainerCollectionBase.cpp

    r1193 r1198  
    8787*/ 
    8888 
    89 /*! \var FieldContainerPtr ContainerCollectionBase::_mfContainers 
     89/*! \var FieldContainer * ContainerCollectionBase::_mfContainers 
    9090    A list of containers held in the collection. 
    9191*/ 
    …… 
    221221 
    222222 
    223 void ContainerCollectionBase::pushToContainers(const FieldContainerPtr value) 
     223void ContainerCollectionBase::pushToContainers(FieldContainer * const value) 
    224224{ 
    225225    editMField(ContainersFieldMask, _mfContainers); 
    …… 
    259259} 
    260260 
    261 void ContainerCollectionBase::removeFromContainers(const FieldContainerPtr value) 
     261void ContainerCollectionBase::removeFromContainers(FieldContainer * const value) 
    262262{ 
    263263    Int32 iElemIdx = _mfContainers.findIndex(value); 
    …… 
    337337    ContainerCollectionTransitPtr fc; 
    338338 
    339     if(getClassType().getPrototype() != NullFC) 
     339    if(getClassType().getPrototype() != NULL) 
    340340    { 
    341341        FieldContainerTransitPtr tmpPtr = 
    …… 
    353353    ContainerCollectionTransitPtr fc; 
    354354 
    355     if(getClassType().getPrototype() != NullFC) 
     355    if(getClassType().getPrototype() != NULL) 
    356356    { 
    357357        FieldContainerTransitPtr tmpPtr = 
    …… 
    365365 
    366366//! create an empty new instance of the class, do not copy the prototype 
    367 ContainerCollectionPtr ContainerCollectionBase::createEmpty(void) 
    368 { 
    369     ContainerCollectionPtr returnValue; 
     367ContainerCollection *ContainerCollectionBase::createEmpty(void) 
     368{ 
     369    ContainerCollection *returnValue; 
    370370 
    371371    newPtr<ContainerCollection>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    377377} 
    378378 
    379 ContainerCollectionPtr ContainerCollectionBase::createEmptyLocal(BitVector bFlags) 
    380 { 
    381     ContainerCollectionPtr returnValue; 
     379ContainerCollection *ContainerCollectionBase::createEmptyLocal(BitVector bFlags) 
     380{ 
     381    ContainerCollection *returnValue; 
    382382 
    383383    newPtr<ContainerCollection>(returnValue, bFlags); 
    …… 
    390390FieldContainerTransitPtr ContainerCollectionBase::shallowCopy(void) const 
    391391{ 
    392     ContainerCollectionPtr tmpPtr; 
     392    ContainerCollection *tmpPtr; 
    393393 
    394394    newPtr(tmpPtr,  
    …… 
    406406    BitVector bFlags) const 
    407407{ 
    408     ContainerCollectionPtr tmpPtr; 
     408    ContainerCollection *tmpPtr; 
    409409 
    410410    newPtr(tmpPtr, dynamic_cast<const ContainerCollection *>(this), bFlags); 
    …… 
    529529 
    530530#ifdef OSG_MT_CPTR_ASPECT 
    531 FieldContainerPtr ContainerCollectionBase::createAspectCopy(void) const 
    532 { 
    533     ContainerCollectionPtr returnValue; 
     531FieldContainer *ContainerCollectionBase::createAspectCopy(void) const 
     532{ 
     533    ContainerCollection *returnValue; 
    534534 
    535535    newAspectCopy(returnValue, 
    …… 
    550550 
    551551#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    552 DataType FieldTraits<ContainerCollectionPtr>::_type("ContainerCollectionPtr", "AttachmentPtr"); 
     552DataType FieldTraits<ContainerCollection *>::_type("ContainerCollectionPtr", "AttachmentPtr"); 
    553553#endif 
    554554 
    555 OSG_FIELDTRAITS_GETTYPE(ContainerCollectionPtr) 
     555OSG_FIELDTRAITS_GETTYPE(ContainerCollection *) 
    556556 
    557557OSG_EXPORT_PTR_SFIELD_FULL(PointerSField,  
    558                            ContainerCollectionPtr,  
     558                           ContainerCollection *,  
    559559                           0); 
    560560 
    561561OSG_EXPORT_PTR_MFIELD_FULL(PointerMField,  
    562                            ContainerCollectionPtr,  
     562                           ContainerCollection *,  
    563563                           0); 
    564564