Show
Ignore:
Timestamp:
04/02/08 14:28:39 (8 months ago)
Author:
cneumann
Message:

base changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/Cluster/Window/Base/OSGImageComposerBase.cpp

    r1032 r1073  
    340340OSG_END_NAMESPACE 
    341341 
    342 #include "OSGSChildFCPointerField.ins" 
    343 #include "OSGSInternalFCPointerField.ins" 
    344 #include "OSGSParentFCPointerField.ins" 
    345 #include "OSGSWeakFCPointerField.ins" 
    346 #include "OSGMChildFCPointerField.ins" 
    347 #include "OSGMInternalFCPointerField.ins" 
    348 #include "OSGMParentFCPointerField.ins" 
    349 #include "OSGMWeakFCPointerField.ins" 
     342#include "OSGChildPointerSField.ins" 
     343#include "OSGParentPointerSField.ins" 
     344#include "OSGUnrecordedPointerSField.ins" 
     345#include "OSGWeakPointerSField.ins" 
     346#include "OSGChildPointerMField.ins" 
     347#include "OSGParentPointerMField.ins" 
     348#include "OSGUnrecordedPointerMField.ins" 
     349#include "OSGWeakPointerMField.ins" 
    350350 
    351351OSG_BEGIN_NAMESPACE 
    …… 
    354354DataType FieldTraits<ImageComposerPtr>::_type( 
    355355    "ImageComposerPtr", 
    356     "AttachmentContainerPtr" ); 
    357 DataType FieldTraits<ImageComposerParentPtr>::_type( 
    358     "ImageComposerParentPtr", 
    359     "AttachmentContainerParentPtr"); 
     356    "AttachmentContainerPtr"    ); 
    360357#endif 
    361358 
    362359OSG_FIELDTRAITS_GETTYPE(ImageComposerPtr) 
    363 OSG_FIELDTRAITS_GETTYPE(ImageComposerParentPtr) 
    364  
    365 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    ImageComposer); 
    366 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, ImageComposer); 
    367 OSG_FIELD_DLLEXPORT_DEF1(SParentFCPointerField,   ImageComposer); 
    368 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     ImageComposer); 
     360 
     361OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      ImageComposer); 
     362OSG_FIELD_DLLEXPORT_DEF1(ParentPointerSField,     ImageComposer); 
     363OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, ImageComposer); 
     364OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       ImageComposer); 
    369365     
    370 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    ImageComposer); 
    371 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, ImageComposer); 
    372 OSG_FIELD_DLLEXPORT_DEF1(MParentFCPointerField,  ImageComposer); 
    373 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     ImageComposer); 
     366OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      ImageComposer); 
     367OSG_FIELD_DLLEXPORT_DEF1(ParentPointerMField,    ImageComposer); 
     368OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, ImageComposer); 
     369OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       ImageComposer); 
    374370 
    375371