Show
Ignore:
Timestamp:
04/15/08 04:48:53 (3 months ago)
Author:
vossg
Message:

changed: renamed fields, base rebuild

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/System/Image/WS/OSGImageFields.h

    r1142 r1161  
    5959 
    6060#include "OSGFieldContainerFields.h" 
    61 #include "OSGFieldContainerPtrSField.h" 
    62 #include "OSGFieldContainerPtrMField.h" 
     61#include "OSGPointerSField.h" 
     62#include "OSGPointerMField.h" 
    6363 
    6464 
    …… 
    192192const Char8 *FieldTraits<ImagePtr, 1>::getSName<RecordedRefCountPolicy>(void) 
    193193{ 
    194     return "SFRecFieldContainerChildImagePtr";  
     194    return "SFRecChildImagePtr";  
    195195} 
    196196 
    …… 
    198198const Char8 *FieldTraits<ImagePtr, 1>::getSName<UnrecordedRefCountPolicy>(void) 
    199199{ 
    200     return "SFUnrecFieldContainerChildImagePtr";  
     200    return "SFUnrecChildImagePtr";  
    201201} 
    202202 
    …… 
    204204const Char8 *FieldTraits<ImagePtr, 1>::getSName<WeakRefCountPolicy>(void) 
    205205{ 
    206     return "SFWeakFieldContainerChildImagePtr";  
     206    return "SFWeakChildImagePtr";  
    207207} 
    208208 
    …… 
    210210const Char8 *FieldTraits<ImagePtr, 1>::getSName<NoRefCountPolicy>(void) 
    211211{ 
    212     return "SFUnrefdFieldContainerChildImagePtr";  
     212    return "SFUnrefdChildImagePtr";  
    213213} 
    214214 
    …… 
    216216const Char8 *FieldTraits<ImagePtr, 1>::getMName<RecordedRefCountPolicy>(void) 
    217217{ 
    218     return "MFRecFieldContainerChildImagePtr";  
     218    return "MFRecChildImagePtr";  
    219219} 
    220220 
    …… 
    222222const Char8 *FieldTraits<ImagePtr, 1>::getMName<UnrecordedRefCountPolicy>(void) 
    223223{ 
    224     return "MFUnrecFieldContainerChildImagePtr";  
     224    return "MFUnrecChildImagePtr";  
    225225} 
    226226 
    …… 
    228228const Char8 *FieldTraits<ImagePtr, 1>::getMName<WeakRefCountPolicy>(void) 
    229229{ 
    230     return "MFWeakFieldContainerChildImagePtr";  
     230    return "MFWeakChildImagePtr";  
    231231} 
    232232 
    …… 
    234234const Char8 *FieldTraits<ImagePtr, 1>::getMName<NoRefCountPolicy>(void) 
    235235{ 
    236     return "MFUnrefdFieldContainerChildImagePtr";  
     236    return "MFUnrefdChildImagePtr";  
    237237} 
    238238 
    …… 
    244244/*! \ingroup GrpSystemFieldSingle */ 
    245245 
    246 typedef FieldContainerPtrSField<ImagePtr, 
    247                                 RecordedRefCountPolicy  > SFRecImagePtr; 
    248 typedef FieldContainerPtrSField<ImagePtr, 
    249                                 UnrecordedRefCountPolicy> SFUnrecImagePtr; 
    250 typedef FieldContainerPtrSField<ImagePtr, 
    251                                 WeakRefCountPolicy      > SFWeakImagePtr; 
    252 typedef FieldContainerPtrSField<ImagePtr, 
    253                                 NoRefCountPolicy        > SFUncountedImagePtr; 
     246typedef PointerSField<ImagePtr, 
     247                      RecordedRefCountPolicy  > SFRecImagePtr; 
     248typedef PointerSField<ImagePtr, 
     249                      UnrecordedRefCountPolicy> SFUnrecImagePtr; 
     250typedef PointerSField<ImagePtr, 
     251                      WeakRefCountPolicy      > SFWeakImagePtr; 
     252typedef PointerSField<ImagePtr, 
     253                      NoRefCountPolicy        > SFUncountedImagePtr; 
    254254#endif 
    255255 
    …… 
    258258/*! \ingroup GrpSystemFieldMulti */ 
    259259 
    260 typedef FieldContainerPtrMField<ImagePtr, 
    261                                 RecordedRefCountPolicy  > MFRecImagePtr; 
    262 typedef FieldContainerPtrMField<ImagePtr, 
    263                                 UnrecordedRefCountPolicy> MFUnrecImagePtr; 
    264 typedef FieldContainerPtrMField<ImagePtr, 
    265                                 WeakRefCountPolicy      > MFWeakImagePtr; 
    266 typedef FieldContainerPtrMField<ImagePtr, 
    267                                 NoRefCountPolicy        > MFUncountedImagePtr; 
    268 #endif 
    269  
    270  
    271  
    272 typedef FieldContainerPtrChildSField< 
     260typedef PointerMField<ImagePtr, 
     261                      RecordedRefCountPolicy  > MFRecImagePtr; 
     262typedef PointerMField<ImagePtr, 
     263                      UnrecordedRefCountPolicy> MFUnrecImagePtr; 
     264typedef PointerMField<ImagePtr, 
     265                      WeakRefCountPolicy      > MFWeakImagePtr; 
     266typedef PointerMField<ImagePtr, 
     267                      NoRefCountPolicy        > MFUncountedImagePtr; 
     268#endif 
     269 
     270 
     271 
     272typedef ChildPointerSField< 
    273273          ImagePtr,  
    274274          UnrecordedRefCountPolicy, 
    275           1                  > SFUnrecFieldContainerChildImagePtr; 
    276  
    277 typedef SFUnrecFieldContainerChildImagePtr  
    278     SFUnrecChildImagePtr; 
     275          1                       > SFUnrecChildImagePtr; 
    279276 
    280277OSG_END_NAMESPACE