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/System/Cluster/Window/SortLast/OSGParallelComposerBase.cpp

    r1098 r1197  
    339339    ParallelComposerTransitPtr fc; 
    340340 
    341     if(getClassType().getPrototype() != NullFC) 
     341    if(getClassType().getPrototype() != NULL) 
    342342    { 
    343343        FieldContainerTransitPtr tmpPtr = 
    …… 
    355355    ParallelComposerTransitPtr fc; 
    356356 
    357     if(getClassType().getPrototype() != NullFC) 
     357    if(getClassType().getPrototype() != NULL) 
    358358    { 
    359359        FieldContainerTransitPtr tmpPtr = 
    …… 
    367367 
    368368//! create an empty new instance of the class, do not copy the prototype 
    369 ParallelComposerPtr ParallelComposerBase::createEmpty(void) 
    370 { 
    371     ParallelComposerPtr returnValue; 
     369ParallelComposer *ParallelComposerBase::createEmpty(void) 
     370{ 
     371    ParallelComposer *returnValue; 
    372372 
    373373    newPtr<ParallelComposer>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    379379} 
    380380 
    381 ParallelComposerPtr ParallelComposerBase::createEmptyLocal(BitVector bFlags) 
    382 { 
    383     ParallelComposerPtr returnValue; 
     381ParallelComposer *ParallelComposerBase::createEmptyLocal(BitVector bFlags) 
     382{ 
     383    ParallelComposer *returnValue; 
    384384 
    385385    newPtr<ParallelComposer>(returnValue, bFlags); 
    …… 
    392392FieldContainerTransitPtr ParallelComposerBase::shallowCopy(void) const 
    393393{ 
    394     ParallelComposerPtr tmpPtr; 
     394    ParallelComposer *tmpPtr; 
    395395 
    396396    newPtr(tmpPtr,  
    …… 
    408408    BitVector bFlags) const 
    409409{ 
    410     ParallelComposerPtr tmpPtr; 
     410    ParallelComposer *tmpPtr; 
    411411 
    412412    newPtr(tmpPtr, dynamic_cast<const ParallelComposer *>(this), bFlags); 
    …… 
    531531 
    532532#ifdef OSG_MT_CPTR_ASPECT 
    533 FieldContainerPtr ParallelComposerBase::createAspectCopy(void) const 
    534 { 
    535     ParallelComposerPtr returnValue; 
     533FieldContainer *ParallelComposerBase::createAspectCopy(void) const 
     534{ 
     535    ParallelComposer *returnValue; 
    536536 
    537537    newAspectCopy(returnValue, 
    …… 
    551551 
    552552#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    553 DataType FieldTraits<ParallelComposerPtr>::_type("ParallelComposerPtr", "ImageComposerPtr"); 
     553DataType FieldTraits<ParallelComposer *>::_type("ParallelComposerPtr", "ImageComposerPtr"); 
    554554#endif 
    555555