Show
Ignore:
Timestamp:
05/05/08 06:58:23 (4 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/Image/WS/OSGImageFields.h

    r1161 r1197  
    8282 
    8383template <> 
    84 struct FieldTraits<ImagePtr> : 
    85     public FieldTraitsFCPtrBase<ImagePtr> 
     84struct FieldTraits<Image *> : 
     85    public FieldTraitsFCPtrBase<Image *> 
    8686{ 
    8787  private: 
    …… 
    9191  public: 
    9292 
    93     typedef FieldTraits<ImagePtr>  Self; 
     93    typedef FieldTraits<Image *>  Self; 
    9494 
    9595    enum                        { Convertible = NotConvertible }; 
    …… 
    108108 
    109109template<> inline 
    110 const Char8 *FieldTraits<ImagePtr, 0>::getSName<RecordedRefCountPolicy>(void) 
     110const Char8 *FieldTraits<Image *, 0>::getSName<RecordedRefCountPolicy>(void) 
    111111{ 
    112112    return "SFRecImagePtr";  
    …… 
    114114 
    115115template<> inline 
    116 const Char8 *FieldTraits<ImagePtr, 0>::getSName<UnrecordedRefCountPolicy>(void) 
     116const Char8 *FieldTraits<Image *, 0>::getSName<UnrecordedRefCountPolicy>(void) 
    117117{ 
    118118    return "SFUnrecImagePtr";  
    …… 
    120120 
    121121template<> inline 
    122 const Char8 *FieldTraits<ImagePtr, 0>::getSName<WeakRefCountPolicy>(void) 
     122const Char8 *FieldTraits<Image *, 0>::getSName<WeakRefCountPolicy>(void) 
    123123{ 
    124124    return "SFWeakImagePtr";  
    …… 
    126126 
    127127template<> inline 
    128 const Char8 *FieldTraits<ImagePtr, 0>::getSName<NoRefCountPolicy>(void) 
     128const Char8 *FieldTraits<Image *, 0>::getSName<NoRefCountPolicy>(void) 
    129129{ 
    130130    return "SFUnrefdImagePtr";  
    …… 
    132132 
    133133template<> inline 
    134 const Char8 *FieldTraits<ImagePtr, 0>::getMName<RecordedRefCountPolicy>(void) 
     134const Char8 *FieldTraits<Image *, 0>::getMName<RecordedRefCountPolicy>(void) 
    135135{ 
    136136    return "MFRecImagePtr";  
    …… 
    138138 
    139139template<> inline 
    140 const Char8 *FieldTraits<ImagePtr, 0>::getMName<UnrecordedRefCountPolicy>(void) 
     140const Char8 *FieldTraits<Image *, 0>::getMName<UnrecordedRefCountPolicy>(void) 
    141141{ 
    142142    return "MFUnrecImagePtr";  
    …… 
    144144 
    145145template<> inline 
    146 const Char8 *FieldTraits<ImagePtr, 0>::getMName<WeakRefCountPolicy>(void) 
     146const Char8 *FieldTraits<Image *, 0>::getMName<WeakRefCountPolicy>(void) 
    147147{ 
    148148    return "MFWeakImagePtr";  
    …… 
    150150 
    151151template<> inline 
    152 const Char8 *FieldTraits<ImagePtr, 0>::getMName<NoRefCountPolicy>(void) 
     152const Char8 *FieldTraits<Image *, 0>::getMName<NoRefCountPolicy>(void) 
    153153{ 
    154154    return "MFUnrefdImagePtr";  
    …… 
    163163 
    164164template <> 
    165 struct FieldTraits<ImagePtr, 1> : 
    166     public FieldTraitsFCPtrBase<ImagePtr, 1> 
     165struct FieldTraits<Image *, 1> : 
     166    public FieldTraitsFCPtrBase<Image *, 1> 
    167167{ 
    168168  private: 
    …… 
    170170  public: 
    171171 
    172     typedef FieldTraits<ImagePtr, 1>  Self; 
    173     typedef FieldContainerPtr           ParentType; 
     172    typedef FieldContainer            *ParentType; 
     173    typedef FieldTraits<Image *, 1>  Self; 
    174174 
    175175    static const FieldType::Cardinality eParentCard = FieldType::MultiField; 
    …… 
    190190 
    191191template<> inline 
    192 const Char8 *FieldTraits<ImagePtr, 1>::getSName<RecordedRefCountPolicy>(void) 
     192const Char8 *FieldTraits<Image *, 1>::getSName<RecordedRefCountPolicy>(void) 
    193193{ 
    194194    return "SFRecChildImagePtr";  
    …… 
    196196 
    197197template<> inline 
    198 const Char8 *FieldTraits<ImagePtr, 1>::getSName<UnrecordedRefCountPolicy>(void) 
     198const Char8 *FieldTraits<Image *, 1>::getSName<UnrecordedRefCountPolicy>(void) 
    199199{ 
    200200    return "SFUnrecChildImagePtr";  
    …… 
    202202 
    203203template<> inline 
    204 const Char8 *FieldTraits<ImagePtr, 1>::getSName<WeakRefCountPolicy>(void) 
     204const Char8 *FieldTraits<Image *, 1>::getSName<WeakRefCountPolicy>(void) 
    205205{ 
    206206    return "SFWeakChildImagePtr";  
    …… 
    208208 
    209209template<> inline 
    210 const Char8 *FieldTraits<ImagePtr, 1>::getSName<NoRefCountPolicy>(void) 
     210const Char8 *FieldTraits<Image *, 1>::getSName<NoRefCountPolicy>(void) 
    211211{ 
    212212    return "SFUnrefdChildImagePtr";  
    …… 
    214214 
    215215template<> inline 
    216 const Char8 *FieldTraits<ImagePtr, 1>::getMName<RecordedRefCountPolicy>(void) 
     216const Char8 *FieldTraits<Image *, 1>::getMName<RecordedRefCountPolicy>(void) 
    217217{ 
    218218    return "MFRecChildImagePtr";  
    …… 
    220220 
    221221template<> inline 
    222 const Char8 *FieldTraits<ImagePtr, 1>::getMName<UnrecordedRefCountPolicy>(void) 
     222const Char8 *FieldTraits<Image *, 1>::getMName<UnrecordedRefCountPolicy>(void) 
    223223{ 
    224224    return "MFUnrecChildImagePtr";  
    …… 
    226226 
    227227template<> inline 
    228 const Char8 *FieldTraits<ImagePtr, 1>::getMName<WeakRefCountPolicy>(void) 
     228const Char8 *FieldTraits<Image *, 1>::getMName<WeakRefCountPolicy>(void) 
    229229{ 
    230230    return "MFWeakChildImagePtr";  
    …… 
    232232 
    233233template<> inline 
    234 const Char8 *FieldTraits<ImagePtr, 1>::getMName<NoRefCountPolicy>(void) 
     234const Char8 *FieldTraits<Image *, 1>::getMName<NoRefCountPolicy>(void) 
    235235{ 
    236236    return "MFUnrefdChildImagePtr";  
    …… 
    244244/*! \ingroup GrpSystemFieldSingle */ 
    245245 
    246 typedef PointerSField<ImagePtr, 
     246typedef PointerSField<Image *, 
    247247                      RecordedRefCountPolicy  > SFRecImagePtr; 
    248 typedef PointerSField<ImagePtr, 
     248typedef PointerSField<Image *, 
    249249                      UnrecordedRefCountPolicy> SFUnrecImagePtr; 
    250 typedef PointerSField<ImagePtr, 
     250typedef PointerSField<Image *, 
    251251                      WeakRefCountPolicy      > SFWeakImagePtr; 
    252 typedef PointerSField<ImagePtr, 
     252typedef PointerSField<Image *, 
    253253                      NoRefCountPolicy        > SFUncountedImagePtr; 
    254254#endif 
    …… 
    258258/*! \ingroup GrpSystemFieldMulti */ 
    259259 
    260 typedef PointerMField<ImagePtr, 
     260typedef PointerMField<Image *, 
    261261                      RecordedRefCountPolicy  > MFRecImagePtr; 
    262 typedef PointerMField<ImagePtr, 
     262typedef PointerMField<Image *, 
    263263                      UnrecordedRefCountPolicy> MFUnrecImagePtr; 
    264 typedef PointerMField<ImagePtr, 
     264typedef PointerMField<Image *, 
    265265                      WeakRefCountPolicy      > MFWeakImagePtr; 
    266 typedef PointerMField<ImagePtr, 
     266typedef PointerMField<Image *, 
    267267                      NoRefCountPolicy        > MFUncountedImagePtr; 
    268268#endif 
    …… 
    271271 
    272272typedef ChildPointerSField< 
    273           ImagePtr,  
     273          Image *,  
    274274          UnrecordedRefCountPolicy, 
    275275          1                       > SFUnrecChildImagePtr;