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/Contrib/Manipulators/OSGScaleManipulatorFields.h

    r1070 r1073  
    5858#include "OSGContribGUIDef.h" 
    5959 
     60#include "OSGContainerForwards.h" 
    6061#include "OSGRefCountPointer.h" 
    61 #include "OSGParentPtrWrapper.h" 
    6262 
    6363#include "OSGManipulatorFields.h" 
    …… 
    7575typedef MTRefCountPtrBuilder      <ScaleManipulator>::Ptr ScaleManipulatorMTRefPtr; 
    7676typedef WeakRefCountPtrBuilder    <ScaleManipulator>::Ptr ScaleManipulatorWeakRefPtr; 
    77 typedef ParentPtrBuilder          <ScaleManipulator>::Ptr ScaleManipulatorParentPtr; 
    7877typedef InternalRefCountPtrBuilder<ScaleManipulator>::Ptr ScaleManipulatorInternalRefPtr; 
    7978typedef TransitPtrBuilder         <ScaleManipulator>::Ptr ScaleManipulatorTransitPtr; 
    …… 
    8988 
    9089template <> 
    91 struct FieldTraits<ScaleManipulatorPtr> 
    92     : public FieldTraitsPointerFieldBase<ScaleManipulatorPtr> 
     90struct FieldTraits<ScaleManipulatorPtr> : public PointerFieldTraitsBase<0> 
    9391{ 
    9492  private: 
    …… 
    9896    typedef FieldTraits<ScaleManipulatorPtr>            Self; 
    9997 
    100     typedef MChildFCPointerField   < ScaleManipulator > HandledMChildField; 
    101     typedef MInternalFCPointerField< ScaleManipulator > HandledMInternalField; 
    102     typedef MWeakFCPointerField    < ScaleManipulator > HandledMWeakField; 
     98    typedef ChildPointerMField     < ScaleManipulator > ChildMField; 
     99    typedef ParentPointerMField    < ScaleManipulator > ParentMField; 
     100    typedef UnrecordedPointerMField< ScaleManipulator > UnrecordedMField; 
     101    typedef WeakPointerMField      < ScaleManipulator > WeakMField; 
    103102     
    104     typedef SChildFCPointerField   < ScaleManipulator > HandledSChildField; 
    105     typedef SInternalFCPointerField< ScaleManipulator > HandledSInternalField; 
    106     typedef SWeakFCPointerField    < ScaleManipulator > HandledSWeakField; 
     103    typedef ChildPointerSField     < ScaleManipulator > ChildSField; 
     104    typedef ParentPointerSField    < ScaleManipulator > ParentSField; 
     105    typedef UnrecordedPointerSField< ScaleManipulator > UnrecordedSField; 
     106    typedef WeakPointerSField      < ScaleManipulator > WeakSField; 
    107107     
    108108    enum { Convertible = NotConvertible }; 
    109109}; 
    110110 
    111 /*! \ingroup GrpContribGUIFieldTraits 
    112  */ 
    113 #if !defined(OSG_DOC_DEV_TRAITS) 
    114 /*! \hideinhierarchy */ 
    115 #endif 
    116  
    117 template <> 
    118 struct FieldTraits<ScaleManipulatorParentPtr> 
    119     : public FieldTraitsParentPointerFieldBase<ScaleManipulatorParentPtr> 
    120 { 
    121   private: 
    122     static DataType _type; 
    123  
    124   public: 
    125  
    126     typedef FieldTraits<ScaleManipulatorParentPtr>  Self; 
    127  
    128     typedef MParentFCPointerField< ScaleManipulator > HandledMParentField; 
    129     typedef SParentFCPointerField< ScaleManipulator > HandledSParentField;     
    130      
    131     enum { Convertible = NotConvertible }; 
    132 }; 
    133  
    134 #if !defined(OSG_DOC_DEV_TRAITS) 
    135 /*! \class  FieldTraitsParentPointerFieldBase<ScaleManipulatorParentPtr, 0> 
    136     \hideinhierarchy 
    137  */ 
    138 #endif 
    139111 
    140112#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)