Show
Ignore:
Timestamp:
05/05/08 06:58:23 (7 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/OSGSepiaComposerBase.cpp

    r1098 r1197  
    160160    SepiaComposerTransitPtr fc; 
    161161 
    162     if(getClassType().getPrototype() != NullFC) 
     162    if(getClassType().getPrototype() != NULL) 
    163163    { 
    164164        FieldContainerTransitPtr tmpPtr = 
    …… 
    176176    SepiaComposerTransitPtr fc; 
    177177 
    178     if(getClassType().getPrototype() != NullFC) 
     178    if(getClassType().getPrototype() != NULL) 
    179179    { 
    180180        FieldContainerTransitPtr tmpPtr = 
    …… 
    188188 
    189189//! create an empty new instance of the class, do not copy the prototype 
    190 SepiaComposerPtr SepiaComposerBase::createEmpty(void) 
    191 { 
    192     SepiaComposerPtr returnValue; 
     190SepiaComposer *SepiaComposerBase::createEmpty(void) 
     191{ 
     192    SepiaComposer *returnValue; 
    193193 
    194194    newPtr<SepiaComposer>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    200200} 
    201201 
    202 SepiaComposerPtr SepiaComposerBase::createEmptyLocal(BitVector bFlags) 
    203 { 
    204     SepiaComposerPtr returnValue; 
     202SepiaComposer *SepiaComposerBase::createEmptyLocal(BitVector bFlags) 
     203{ 
     204    SepiaComposer *returnValue; 
    205205 
    206206    newPtr<SepiaComposer>(returnValue, bFlags); 
    …… 
    213213FieldContainerTransitPtr SepiaComposerBase::shallowCopy(void) const 
    214214{ 
    215     SepiaComposerPtr tmpPtr; 
     215    SepiaComposer *tmpPtr; 
    216216 
    217217    newPtr(tmpPtr,  
    …… 
    229229    BitVector bFlags) const 
    230230{ 
    231     SepiaComposerPtr tmpPtr; 
     231    SepiaComposer *tmpPtr; 
    232232 
    233233    newPtr(tmpPtr, dynamic_cast<const SepiaComposer *>(this), bFlags); 
    …… 
    280280 
    281281#ifdef OSG_MT_CPTR_ASPECT 
    282 FieldContainerPtr SepiaComposerBase::createAspectCopy(void) const 
    283 { 
    284     SepiaComposerPtr returnValue; 
     282FieldContainer *SepiaComposerBase::createAspectCopy(void) const 
     283{ 
     284    SepiaComposer *returnValue; 
    285285 
    286286    newAspectCopy(returnValue, 
    …… 
    300300 
    301301#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    302 DataType FieldTraits<SepiaComposerPtr>::_type("SepiaComposerPtr", "ImageComposerPtr"); 
     302DataType FieldTraits<SepiaComposer *>::_type("SepiaComposerPtr", "ImageComposerPtr"); 
    303303#endif 
    304304