Show
Ignore:
Timestamp:
05/05/08 07:12:19 (3 months ago)
Author:
vossg
Message:

changed: interface cleanup, removed ptr typedefs, nullfc

these will be needed for the 1.x compat stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/Contrib/VTK/OSGVTKMapperFields.h

    r1161 r1198  
    8282 
    8383template <> 
    84 struct FieldTraits<VTKMapperPtr> : 
    85     public FieldTraitsFCPtrBase<VTKMapperPtr> 
     84struct FieldTraits<VTKMapper *> : 
     85    public FieldTraitsFCPtrBase<VTKMapper *> 
    8686{ 
    8787  private: 
    …… 
    9191  public: 
    9292 
    93     typedef FieldTraits<VTKMapperPtr>  Self; 
     93    typedef FieldTraits<VTKMapper *>  Self; 
    9494 
    9595    enum                        { Convertible = NotConvertible }; 
    …… 
    108108 
    109109template<> inline 
    110 const Char8 *FieldTraits<VTKMapperPtr, 0>::getSName<RecordedRefCountPolicy>(void) 
     110const Char8 *FieldTraits<VTKMapper *, 0>::getSName<RecordedRefCountPolicy>(void) 
    111111{ 
    112112    return "SFRecVTKMapperPtr";  
    …… 
    114114 
    115115template<> inline 
    116 const Char8 *FieldTraits<VTKMapperPtr, 0>::getSName<UnrecordedRefCountPolicy>(void) 
     116const Char8 *FieldTraits<VTKMapper *, 0>::getSName<UnrecordedRefCountPolicy>(void) 
    117117{ 
    118118    return "SFUnrecVTKMapperPtr";  
    …… 
    120120 
    121121template<> inline 
    122 const Char8 *FieldTraits<VTKMapperPtr, 0>::getSName<WeakRefCountPolicy>(void) 
     122const Char8 *FieldTraits<VTKMapper *, 0>::getSName<WeakRefCountPolicy>(void) 
    123123{ 
    124124    return "SFWeakVTKMapperPtr";  
    …… 
    126126 
    127127template<> inline 
    128 const Char8 *FieldTraits<VTKMapperPtr, 0>::getSName<NoRefCountPolicy>(void) 
     128const Char8 *FieldTraits<VTKMapper *, 0>::getSName<NoRefCountPolicy>(void) 
    129129{ 
    130130    return "SFUnrefdVTKMapperPtr";  
    …… 
    132132 
    133133template<> inline 
    134 const Char8 *FieldTraits<VTKMapperPtr, 0>::getMName<RecordedRefCountPolicy>(void) 
     134const Char8 *FieldTraits<VTKMapper *, 0>::getMName<RecordedRefCountPolicy>(void) 
    135135{ 
    136136    return "MFRecVTKMapperPtr";  
    …… 
    138138 
    139139template<> inline 
    140 const Char8 *FieldTraits<VTKMapperPtr, 0>::getMName<UnrecordedRefCountPolicy>(void) 
     140const Char8 *FieldTraits<VTKMapper *, 0>::getMName<UnrecordedRefCountPolicy>(void) 
    141141{ 
    142142    return "MFUnrecVTKMapperPtr";  
    …… 
    144144 
    145145template<> inline 
    146 const Char8 *FieldTraits<VTKMapperPtr, 0>::getMName<WeakRefCountPolicy>(void) 
     146const Char8 *FieldTraits<VTKMapper *, 0>::getMName<WeakRefCountPolicy>(void) 
    147147{ 
    148148    return "MFWeakVTKMapperPtr";  
    …… 
    150150 
    151151template<> inline 
    152 const Char8 *FieldTraits<VTKMapperPtr, 0>::getMName<NoRefCountPolicy>(void) 
     152const Char8 *FieldTraits<VTKMapper *, 0>::getMName<NoRefCountPolicy>(void) 
    153153{ 
    154154    return "MFUnrefdVTKMapperPtr";  
    …… 
    167167/*! \ingroup GrpContribVTKFieldSingle */ 
    168168 
    169 typedef PointerSField<VTKMapperPtr, 
     169typedef PointerSField<VTKMapper *, 
    170170                      RecordedRefCountPolicy  > SFRecVTKMapperPtr; 
    171 typedef PointerSField<VTKMapperPtr, 
     171typedef PointerSField<VTKMapper *, 
    172172                      UnrecordedRefCountPolicy> SFUnrecVTKMapperPtr; 
    173 typedef PointerSField<VTKMapperPtr, 
     173typedef PointerSField<VTKMapper *, 
    174174                      WeakRefCountPolicy      > SFWeakVTKMapperPtr; 
    175 typedef PointerSField<VTKMapperPtr, 
     175typedef PointerSField<VTKMapper *, 
    176176                      NoRefCountPolicy        > SFUncountedVTKMapperPtr; 
    177177#endif 
    …… 
    181181/*! \ingroup GrpContribVTKFieldMulti */ 
    182182 
    183 typedef PointerMField<VTKMapperPtr, 
     183typedef PointerMField<VTKMapper *, 
    184184                      RecordedRefCountPolicy  > MFRecVTKMapperPtr; 
    185 typedef PointerMField<VTKMapperPtr, 
     185typedef PointerMField<VTKMapper *, 
    186186                      UnrecordedRefCountPolicy> MFUnrecVTKMapperPtr; 
    187 typedef PointerMField<VTKMapperPtr, 
     187typedef PointerMField<VTKMapper *, 
    188188                      WeakRefCountPolicy      > MFWeakVTKMapperPtr; 
    189 typedef PointerMField<VTKMapperPtr, 
     189typedef PointerMField<VTKMapper *, 
    190190                      NoRefCountPolicy        > MFUncountedVTKMapperPtr; 
    191191#endif