Show
Ignore:
Timestamp:
11/14/07 17:11:26 (1 year ago)
Author:
cneumann
Message:

changed: started to use new pointer fields
added: ReferenceCountPointer? template
removed: EditHandle? for parent pointer fields

NOTE: Does not compile yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r862 r1016  
    5858#include "OSGClusterDef.h" 
    5959 
     60#include "OSGReferenceCountPointer.h" 
     61#include "OSGParentPointer.h" 
     62 
    6063#include "OSGClusterWindowFields.h" 
    6164 
    62 #include "OSGSFieldAdaptor.h" 
    63 #include "OSGMFieldAdaptor.h" 
    64  
     65#include "OSGSPointerFieldAdapter.h" 
     66#include "OSGMPointerFieldAdapter.h" 
    6567 
    6668OSG_BEGIN_NAMESPACE 
    67  
    68 class MultiDisplayWindow; 
    6969 
    7070#if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles 
    7171//! MultiDisplayWindowPtr 
    7272 
     73class MultiDisplayWindow; 
     74 
    7375OSG_GEN_CONTAINERPTR(MultiDisplayWindow); 
     76 
     77typedef RefCountPtrBuilder<MultiDisplayWindow>::Ptr         MultiDisplayWindowRefPtr; 
     78typedef MTRefCountPtrBuilder<MultiDisplayWindow>::Ptr       MultiDisplayWindowMTRefPtr; 
     79typedef WeakRefCountPtrBuilder<MultiDisplayWindow>::Ptr     MultiDisplayWindowWeakRefPtr; 
     80typedef ParentPtrBuilder<MultiDisplayWindow>::Ptr           MultiDisplayWindowParentPtr; 
    7481 
    7582#endif 
    …… 
    8390 
    8491template <> 
    85 struct FieldTraits<MultiDisplayWindowPtr> : 
    86     public FieldTraitsFCPtrBase<MultiDisplayWindowPtr> 
     92struct FieldTraits<MultiDisplayWindowInternalRefPtr> : 
     93    public FieldTraitsFCReferenceCountPointerBase<MultiDisplayWindowInternalRefPtr> 
    8794{ 
    8895  private: 
    8996 
    90     static DataType             _type; 
     97    static DataType _type; 
    9198 
    9299  public: 
    93100 
    94     typedef FieldTraits<MultiDisplayWindowPtr>  Self; 
     101    typedef FieldTraits<MultiDisplayWindowInternalRefPtr>  Self; 
    95102 
    96     enum                        { Convertible = NotConvertible }; 
     103    enum { Convertible = NotConvertible }; 
     104}; 
     105 
     106/*! \ingroup GrpClusterFieldTraits 
     107 */ 
     108#if !defined(OSG_DOC_DEV_TRAITS) 
     109/*! \hideinhierarchy */ 
     110#endif 
     111 
     112template <> 
     113struct FieldTraits<MultiDisplayWindowWeakRefPtr> : 
     114    public FieldTraitsFCReferenceCountPointerBase<MultiDisplayWindowWeakRefPtr> 
     115{ 
     116  private: 
     117 
     118    static DataType _type; 
     119 
     120  public: 
     121 
     122    typedef FieldTraits<MultiDisplayWindowWeakRefPtr>  Self; 
     123 
     124    enum { Convertible = NotConvertible }; 
     125}; 
     126 
     127/*! \ingroup GrpClusterFieldTraits 
     128 */ 
     129#if !defined(OSG_DOC_DEV_TRAITS) 
     130/*! \hideinhierarchy */ 
     131#endif 
     132 
     133template <> 
     134struct FieldTraits<MultiDisplayWindowParentPtr> : 
     135    public FieldTraitsFCParentPointerBase<MultiDisplayWindowParentPtr> 
     136{ 
     137  private: 
     138 
     139    static DataType _type; 
     140 
     141  public: 
     142 
     143    typedef FieldTraits<MultiDisplayWindowParentPtr>  Self; 
     144 
     145    enum { Convertible = NotConvertible }; 
    97146}; 
    98147 
    …… 
    106155 
    107156 
    108  
    109157OSG_END_NAMESPACE 
    110158