Show
Ignore:
Timestamp:
05/05/08 06:58:23 (2 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/System/Cluster/Window/MultiDisplay/OSGMultiDisplayWindowBase.cpp

    r1098 r1197  
    455455    MultiDisplayWindowTransitPtr fc; 
    456456 
    457     if(getClassType().getPrototype() != NullFC) 
     457    if(getClassType().getPrototype() != NULL) 
    458458    { 
    459459        FieldContainerTransitPtr tmpPtr = 
    …… 
    471471    MultiDisplayWindowTransitPtr fc; 
    472472 
    473     if(getClassType().getPrototype() != NullFC) 
     473    if(getClassType().getPrototype() != NULL) 
    474474    { 
    475475        FieldContainerTransitPtr tmpPtr = 
    …… 
    483483 
    484484//! create an empty new instance of the class, do not copy the prototype 
    485 MultiDisplayWindowPtr MultiDisplayWindowBase::createEmpty(void) 
    486 { 
    487     MultiDisplayWindowPtr returnValue; 
     485MultiDisplayWindow *MultiDisplayWindowBase::createEmpty(void) 
     486{ 
     487    MultiDisplayWindow *returnValue; 
    488488 
    489489    newPtr<MultiDisplayWindow>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    495495} 
    496496 
    497 MultiDisplayWindowPtr MultiDisplayWindowBase::createEmptyLocal(BitVector bFlags) 
    498 { 
    499     MultiDisplayWindowPtr returnValue; 
     497MultiDisplayWindow *MultiDisplayWindowBase::createEmptyLocal(BitVector bFlags) 
     498{ 
     499    MultiDisplayWindow *returnValue; 
    500500 
    501501    newPtr<MultiDisplayWindow>(returnValue, bFlags); 
    …… 
    508508FieldContainerTransitPtr MultiDisplayWindowBase::shallowCopy(void) const 
    509509{ 
    510     MultiDisplayWindowPtr tmpPtr; 
     510    MultiDisplayWindow *tmpPtr; 
    511511 
    512512    newPtr(tmpPtr,  
    …… 
    524524    BitVector bFlags) const 
    525525{ 
    526     MultiDisplayWindowPtr tmpPtr; 
     526    MultiDisplayWindow *tmpPtr; 
    527527 
    528528    newPtr(tmpPtr, dynamic_cast<const MultiDisplayWindow *>(this), bFlags); 
    …… 
    695695 
    696696#ifdef OSG_MT_CPTR_ASPECT 
    697 FieldContainerPtr MultiDisplayWindowBase::createAspectCopy(void) const 
    698 { 
    699     MultiDisplayWindowPtr returnValue; 
     697FieldContainer *MultiDisplayWindowBase::createAspectCopy(void) const 
     698{ 
     699    MultiDisplayWindow *returnValue; 
    700700 
    701701    newAspectCopy(returnValue, 
    …… 
    715715 
    716716#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    717 DataType FieldTraits<MultiDisplayWindowPtr>::_type("MultiDisplayWindowPtr", "ClusterWindowPtr"); 
     717DataType FieldTraits<MultiDisplayWindow *>::_type("MultiDisplayWindowPtr", "ClusterWindowPtr"); 
    718718#endif 
    719719