Show
Ignore:
Timestamp:
05/05/08 06:58:23 (3 months ago)
Author:
vossg
Message:

changed: base rebuild interface clean up (removal ptr typedef / NullFC)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/Contrib/Manipulators/OSGMoveManipulatorBase.cpp

    r1098 r1197  
    161161    MoveManipulatorTransitPtr fc; 
    162162 
    163     if(getClassType().getPrototype() != NullFC) 
     163    if(getClassType().getPrototype() != NULL) 
    164164    { 
    165165        FieldContainerTransitPtr tmpPtr = 
    …… 
    177177    MoveManipulatorTransitPtr fc; 
    178178 
    179     if(getClassType().getPrototype() != NullFC) 
     179    if(getClassType().getPrototype() != NULL) 
    180180    { 
    181181        FieldContainerTransitPtr tmpPtr = 
    …… 
    189189 
    190190//! create an empty new instance of the class, do not copy the prototype 
    191 MoveManipulatorPtr MoveManipulatorBase::createEmpty(void) 
    192 { 
    193     MoveManipulatorPtr returnValue; 
     191MoveManipulator *MoveManipulatorBase::createEmpty(void) 
     192{ 
     193    MoveManipulator *returnValue; 
    194194 
    195195    newPtr<MoveManipulator>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    201201} 
    202202 
    203 MoveManipulatorPtr MoveManipulatorBase::createEmptyLocal(BitVector bFlags) 
    204 { 
    205     MoveManipulatorPtr returnValue; 
     203MoveManipulator *MoveManipulatorBase::createEmptyLocal(BitVector bFlags) 
     204{ 
     205    MoveManipulator *returnValue; 
    206206 
    207207    newPtr<MoveManipulator>(returnValue, bFlags); 
    …… 
    214214FieldContainerTransitPtr MoveManipulatorBase::shallowCopy(void) const 
    215215{ 
    216     MoveManipulatorPtr tmpPtr; 
     216    MoveManipulator *tmpPtr; 
    217217 
    218218    newPtr(tmpPtr,  
    …… 
    230230    BitVector bFlags) const 
    231231{ 
    232     MoveManipulatorPtr tmpPtr; 
     232    MoveManipulator *tmpPtr; 
    233233 
    234234    newPtr(tmpPtr, dynamic_cast<const MoveManipulator *>(this), bFlags); 
    …… 
    281281 
    282282#ifdef OSG_MT_CPTR_ASPECT 
    283 FieldContainerPtr MoveManipulatorBase::createAspectCopy(void) const 
    284 { 
    285     MoveManipulatorPtr returnValue; 
     283FieldContainer *MoveManipulatorBase::createAspectCopy(void) const 
     284{ 
     285    MoveManipulator *returnValue; 
    286286 
    287287    newAspectCopy(returnValue, 
    …… 
    301301 
    302302#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    303 DataType FieldTraits<MoveManipulatorPtr>::_type("MoveManipulatorPtr", "ManipulatorPtr"); 
     303DataType FieldTraits<MoveManipulator *>::_type("MoveManipulatorPtr", "ManipulatorPtr"); 
    304304#endif 
    305305