Show
Ignore:
Timestamp:
04/02/08 14:18:07 (8 months ago)
Author:
cneumann
Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

  • new OSB loader works (well, the unittest does)
  • VRML loader is deactivated
  • get/edit handle for dynamic (pointer) fields missing
  • need to remove some more old files - they get moved in this commit
  • generated (i.e. base) code in following commit
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldHandle.h

    r1032 r1072  
    150150    /*---------------------------------------------------------------------*/ 
    151151 
    152     virtual bool equal(Ptr rhs) = 0; 
     152    virtual bool equal(Ptr rhs) const = 0; 
    153153 
    154154    bool operator ==(const EditFieldHandle &rhs); 
    …… 
    209209    /*---------------------------------------------------------------------*/ 
    210210 
    211     virtual bool equal(Ptr rhs) = 0; 
     211    virtual bool equal(Ptr rhs) const = 0; 
    212212 
    213213    bool operator ==(const EditFieldHandle &rhs); 
    …… 
    221221        const TypePtrVector     &ignoreTypes    = TypePtrVector(), 
    222222        const TypeIdVector      &shareGroupIds  = TypeIdVector (), 
    223         const TypeIdVector      &ignoreGroupIds = TypeIdVector ()) const = 0; 
     223        const TypeIdVector      &ignoreGroupIds = TypeIdVector () ) = 0; 
    224224}; 
    225225 
    …… 
    270270    /*---------------------------------------------------------------------*/ 
    271271 
    272     virtual bool equal(Inherited::Ptr rhs); 
     272    virtual bool equal(Inherited::Ptr rhs) const; 
    273273 
    274274    /*---------------------------------------------------------------------*/ 
    …… 
    286286        const TypePtrVector     &ignoreTypes    = TypePtrVector(), 
    287287        const TypeIdVector      &shareGroupIds  = TypeIdVector (), 
    288         const TypeIdVector      &ignoreGroupIds = TypeIdVector ()) const; 
     288        const TypeIdVector      &ignoreGroupIds = TypeIdVector () ); 
    289289 
    290290    /*---------------------------------------------------------------------*/ 
    …… 
    342342    /*---------------------------------------------------------------------*/ 
    343343 
    344     virtual bool equal(Inherited::Ptr rhs); 
     344    virtual bool equal(Inherited::Ptr rhs) const; 
    345345 
    346346    /*---------------------------------------------------------------------*/ 
    …… 
    358358        const TypePtrVector     &ignoreTypes    = TypePtrVector(), 
    359359        const TypeIdVector      &shareGroupIds  = TypeIdVector (), 
    360         const TypeIdVector      &ignoreGroupIds = TypeIdVector ()) const; 
     360        const TypeIdVector      &ignoreGroupIds = TypeIdVector () ); 
    361361 
    362362    /*---------------------------------------------------------------------*/ 
    …… 
    411411    /*---------------------------------------------------------------------*/ 
    412412 
    413     virtual bool equal(Inherited::Ptr rhs); 
     413    virtual bool equal(Inherited::Ptr rhs) const; 
    414414 
    415415    /*---------------------------------------------------------------------*/ 
    …… 
    465465    /*---------------------------------------------------------------------*/ 
    466466 
    467     virtual bool equal(Inherited::Ptr rhs); 
     467    virtual bool equal(Inherited::Ptr rhs) const; 
    468468 
    469469    /*---------------------------------------------------------------------*/