Show
Ignore:
Timestamp:
10/20/07 18:11:52 (1 year ago)
Author:
cneumann
Message:

added: RootObjectT template paremter for ReferenceCountPointer?

and ParentPointer? templates - allows use for FieldBundles?

compile fixes - but still not done

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork/Source/System/Cluster/Window/MultiDisplay/OSGMultiDisplayWindowFields.h

    r969 r976  
    5858#include "OSGClusterDef.h" 
    5959 
    60 #include "OSGParentContainer.h" 
    61 #include "OSGInternalRefPtr.h" 
     60#include "OSGReferenceCountPointer.h" 
     61#include "OSGParentPointer.h" 
    6262 
    6363#include "OSGClusterWindowFields.h" 
    6464 
    65 #include "OSGSFieldAdaptor.h" 
    66 #include "OSGMFieldAdaptor.h" 
    67  
     65#include "OSGSPointerFieldAdapter.h" 
     66#include "OSGMPointerFieldAdapter.h" 
    6867 
    6968OSG_BEGIN_NAMESPACE 
     69 
     70#if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles 
     71//! MultiDisplayWindowPtr 
    7072 
    7173class MultiDisplayWindow; 
    …… 
    7375OSG_GEN_CONTAINERPTR(MultiDisplayWindow); 
    7476 
    75 typedef RefPtr<MultiDisplayWindow>         MultiDisplayWindowRefPtr; 
    76 typedef MTRefPtr<MultiDisplayWindow>       MultiDisplayWindowMTRefPtr; 
     77typedef RefCountPtrBuilder<MultiDisplayWindow>::Ptr         MultiDisplayWindowRefPtr; 
     78typedef MTRefCountPtrBuilder<MultiDisplayWindow>::Ptr       MultiDisplayWindowMTRefPtr; 
     79typedef WeakRefCountPtrBuilder<MultiDisplayWindow>::Ptr     MultiDisplayWindowWeakRefPtr; 
     80typedef InternalRefCountPtrBuilder<MultiDisplayWindow>::Ptr MultiDisplayWindowInternalRefPtr; 
    7781 
    78 typedef InternalRefPtr<MultiDisplayWindow>       MultiDisplayWindowInternalRefPtr; 
    79 typedef InternalRefPtr<MultiDisplayWindow> const MultiDisplayWindowInternalRefPtrConst; 
    80 typedef InternalRefPtr<MultiDisplayWindow> const MultiDisplayWindowInternalRefPtrConstArg; 
    81  
    82 typedef PtrWrapper<MultiDisplayWindow, 
    83                    MultiDisplayWindowPtr>        ParentMultiDisplayWindowPtr; 
    84 typedef PtrWrapper<MultiDisplayWindow, 
    85                    MultiDisplayWindowPtr> const  ParentMultiDisplayWindowPtrConst; 
    86  
    87 #if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles 
    88 //! MultiDisplayWindowPtr 
    89  
    90 OSG_GEN_CONTAINERPTR(MultiDisplayWindow); 
     82typedef ParentPtrBuilder<MultiDisplayWindow>::Ptr           MultiDisplayWindowParentPtr; 
    9183 
    9284#endif 
    …… 
    10092 
    10193template <> 
    102 struct FieldTraits<MultiDisplayWindowPtr> : 
    103     public FieldTraitsFCPtrBase<MultiDisplayWindowPtr> 
     94struct FieldTraits<MultiDisplayWindowInternalRefPtr> : 
     95    public FieldTraitsFCReferenceCountPointerBase<MultiDisplayWindowInternalRefPtr> 
    10496{ 
    10597  private: 
    10698 
    107     static DataType             _type; 
     99    static DataType _type; 
    108100 
    109101  public: 
    110102 
    111     typedef FieldTraits<MultiDisplayWindowPtr>  Self; 
     103    typedef FieldTraits<MultiDisplayWindowInternalRefPtr>  Self; 
    112104 
    113     enum                        { Convertible = NotConvertible }; 
     105    enum { Convertible = NotConvertible }; 
    114106}; 
    115107 
    116 #if !defined(OSG_DOC_DEV_TRAITS) 
    117 /*! \class  FieldTraitsTemplateBase<MultiDisplayWindowPtr, 0> 
    118     \hideinhierarchy 
    119  */ 
    120 #endif 
    121  
    122 #endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    123  
    124 #if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    125108/*! \ingroup GrpClusterFieldTraits 
    126109 */ 
    …… 
    130113 
    131114template <> 
    132 struct FieldTraits<MultiDisplayWindowInternalRefPtr> : 
    133     public FieldTraitsFCPtrBase<MultiDisplayWindowInternalRefPtr> 
     115struct FieldTraits<MultiDisplayWindowWeakRefPtr> : 
     116    public FieldTraitsFCReferenceCountPointerBase<MultiDisplayWindowWeakRefPtr> 
    134117{ 
    135118  private: 
    136119 
    137     static DataType             _type; 
     120    static DataType _type; 
    138121 
    139122  public: 
    140123 
    141     typedef FieldTraits<MultiDisplayWindowInternalRefPtr>  Self; 
     124    typedef FieldTraits<MultiDisplayWindowWeakRefPtr>  Self; 
    142125 
    143     enum                        { Convertible = NotConvertible }; 
     126    enum { Convertible = NotConvertible }; 
    144127}; 
    145128 
    146 #if !defined(OSG_DOC_DEV_TRAITS) 
    147 /*! \class  FieldTraitsTemplateBase<MultiDisplayWindowPtr, 0> 
    148     \hideinhierarchy 
    149  */ 
    150 #endif 
    151  
    152 #endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    153  
    154 #if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    155129/*! \ingroup GrpClusterFieldTraits 
    156130 */ 
    …… 
    160134 
    161135template <> 
    162 struct FieldTraits<ParentMultiDisplayWindowPtr> : 
    163     public FieldTraitsFCPtrBase<ParentMultiDisplayWindowPtr> 
     136struct FieldTraits<MultiDisplayWindowParentPtr> : 
     137    public FieldTraitsFCParentPointerBase<MultiDisplayWindowParentPtr> 
    164138{ 
    165139  private: 
    166140 
    167     static DataType             _type; 
     141    static DataType _type; 
    168142 
    169143  public: 
    170144 
    171     typedef FieldTraits<ParentMultiDisplayWindowPtr>  Self; 
     145    typedef FieldTraits<MultiDisplayWindowParentPtr>  Self; 
    172146 
    173     enum                        { Convertible = NotConvertible }; 
     147    enum { Convertible = NotConvertible }; 
    174148}; 
    175149