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/OSGPipelineComposerBase.cpp

    r1098 r1197  
    395395    PipelineComposerTransitPtr fc; 
    396396 
    397     if(getClassType().getPrototype() != NullFC) 
     397    if(getClassType().getPrototype() != NULL) 
    398398    { 
    399399        FieldContainerTransitPtr tmpPtr = 
    …… 
    411411    PipelineComposerTransitPtr fc; 
    412412 
    413     if(getClassType().getPrototype() != NullFC) 
     413    if(getClassType().getPrototype() != NULL) 
    414414    { 
    415415        FieldContainerTransitPtr tmpPtr = 
    …… 
    423423 
    424424//! create an empty new instance of the class, do not copy the prototype 
    425 PipelineComposerPtr PipelineComposerBase::createEmpty(void) 
    426 { 
    427     PipelineComposerPtr returnValue; 
     425PipelineComposer *PipelineComposerBase::createEmpty(void) 
     426{ 
     427    PipelineComposer *returnValue; 
    428428 
    429429    newPtr<PipelineComposer>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    435435} 
    436436 
    437 PipelineComposerPtr PipelineComposerBase::createEmptyLocal(BitVector bFlags) 
    438 { 
    439     PipelineComposerPtr returnValue; 
     437PipelineComposer *PipelineComposerBase::createEmptyLocal(BitVector bFlags) 
     438{ 
     439    PipelineComposer *returnValue; 
    440440 
    441441    newPtr<PipelineComposer>(returnValue, bFlags); 
    …… 
    448448FieldContainerTransitPtr PipelineComposerBase::shallowCopy(void) const 
    449449{ 
    450     PipelineComposerPtr tmpPtr; 
     450    PipelineComposer *tmpPtr; 
    451451 
    452452    newPtr(tmpPtr,  
    …… 
    464464    BitVector bFlags) const 
    465465{ 
    466     PipelineComposerPtr tmpPtr; 
     466    PipelineComposer *tmpPtr; 
    467467 
    468468    newPtr(tmpPtr, dynamic_cast<const PipelineComposer *>(this), bFlags); 
    …… 
    611611 
    612612#ifdef OSG_MT_CPTR_ASPECT 
    613 FieldContainerPtr PipelineComposerBase::createAspectCopy(void) const 
    614 { 
    615     PipelineComposerPtr returnValue; 
     613FieldContainer *PipelineComposerBase::createAspectCopy(void) const 
     614{ 
     615    PipelineComposer *returnValue; 
    616616 
    617617    newAspectCopy(returnValue, 
    …… 
    631631 
    632632#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    633 DataType FieldTraits<PipelineComposerPtr>::_type("PipelineComposerPtr", "ImageComposerPtr"); 
     633DataType FieldTraits<PipelineComposer *>::_type("PipelineComposerPtr", "ImageComposerPtr"); 
    634634#endif 
    635635