Show
Ignore:
Timestamp:
10/20/07 18:11:52 (10 months 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/Base/OSGClusterWindowBase.h

    r965 r976  
    325325    /*! \{                                                                 */ 
    326326     
    327             SFWindowPtr const *getSFClientWindow(void) const; 
     327            SFWindowInternalRefPtr const *getSFClientWindow(void) const; 
    328328            WindowPtrConst getClientWindow(void) const; 
    329329     
    …… 
    369369    /*! \{                                                                 */ 
    370370     
    371             SFImageComposerPtr const *getSFComposer(void) const; 
     371            SFImageComposerInternalRefPtr const *getSFComposer(void) const; 
    372372            ImageComposerPtrConst getComposer(void) const; 
    373373     
    …… 
    440440    static TypeObject _type; 
    441441 
    442     static void   classDescInserter(TypeObject &oType); 
    443     static Char8 *getClassname     (void             ); 
     442    static void         classDescInserter(TypeObject &oType); 
     443    static Char8 const *getClassname     (void             ); 
    444444 
    445445    /*---------------------------------------------------------------------*/ 
    …… 
    455455    SFString          _sfServiceAddress; 
    456456    SFString          _sfServiceInterface; 
    457     SFWindowPtr      _sfClientWindow; 
     457    SFWindowInternalRefPtr _sfClientWindow; 
    458458    SFUInt32          _sfInterleave; 
    459459    SFUInt32          _sfFrameCount; 
    460     SFImageComposerPtr _sfComposer; 
     460    SFImageComposerInternalRefPtr _sfComposer; 
    461461    MFString          _mfAutostart; 
    462462 
    …… 
    560560typedef ClusterWindowBase *ClusterWindowBaseP; 
    561561 
    562 /** Type specific RefPtr type for ClusterWindow. */ 
    563 typedef RefPtr<ClusterWindow>   ClusterWindowRefPtr; 
    564 typedef MTRefPtr<ClusterWindow> ClusterWindowMTRefPtr; 
    565  
    566 typedef InternalRefPtr<ClusterWindow>       ClusterWindowInternalRefPtr; 
    567 typedef InternalRefPtr<ClusterWindow> const ClusterWindowInternalRefPtrConst; 
    568 typedef InternalRefPtr<ClusterWindow> const ClusterWindowInternalRefPtrConstArg; 
     562typedef RefCountPtrBuilder<ClusterWindow>::Ptr         ClusterWindowRefPtr; 
     563typedef MTRefCountPtrBuilder<ClusterWindow>::Ptr       ClusterWindowMTRefPtr; 
     564typedef WeakRefCountPtrBuilder<ClusterWindow>::Ptr     ClusterWindowWeakRefPtr; 
     565typedef InternalRefCountPtrBuilder<ClusterWindow>::Ptr ClusterWindowInternalRefPtr; 
     566 
     567typedef ParentPtrBuilder<ClusterWindow>::Ptr           ClusterWindowParentPtr; 
    569568 
    570569typedef boost::mpl::if_<