Show
Ignore:
Timestamp:
12/19/07 17:56:03 (9 months ago)
Author:
cneumann
Message:

changed: generic interface activated
fixed: single parent unlinking

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGEditMFCPointerFieldHandle.inl

    r1032 r1033  
    328328template <class FieldT> 
    329329inline void 
    330 EditMFCPointerFieldHandle<FieldT>::sub(FieldContainer * const pOldElement) 
     330EditMFCPointerFieldHandle<FieldT>::subObject(FieldContainer * const pOldElement) 
    331331{ 
    332332    HandledFieldValueType pTypedOldElement = 
    …… 
    371371template <class FieldT> 
    372372inline void 
    373 EditMFCPointerFieldHandle<FieldT>::replace( 
     373EditMFCPointerFieldHandle<FieldT>::replaceObject( 
    374374    FieldContainer * const pOldElement, 
    375375    FieldContainer * const pNewElement) 
    …… 
    443443 
    444444/*-------------------------------------------------------------------------*/ 
    445 /* DynamicEditMFCPointerFieldHandle<FieldT>                                       */ 
     445/* DynamicEditMFCPointerFieldHandle<FieldT>                                */ 
    446446/*-------------------------------------------------------------------------*/ 
    447447 
    …… 
    605605    { 
    606606        typename HandledFieldType::iterator vI = 
    607             castFieldDown()->begin() + index; 
     607            castFieldDown()->begin() + uiIndex; 
    608608             
    609609        castFieldDown()->erase(vI); 
    …… 
    613613template <class FieldT> 
    614614inline void 
    615 DynamicEditMFCPointerFieldHandle<FieldT>::sub(FieldContainer * const pOldElement) 
     615DynamicEditMFCPointerFieldHandle<FieldT>::subObject( 
     616    FieldContainer * const pOldElement) 
    616617{ 
    617618    HandledFieldValueType pTypedOldElement = 
    …… 
    639640        dynamic_cast<HandledFieldValueType>(pNewElement); 
    640641 
    641     if((pTypedNewElement != NULL) && (uiIndex < castFieldDown()->size)) 
     642    if((pTypedNewElement != NULL) && (uiIndex < castFieldDown()->size())) 
    642643    { 
    643644        typename HandledFieldType::iterator vI = 
    …… 
    657658        dynamic_cast<HandledFieldValueType>(pNewElement); 
    658659 
    659     if((pTypedNewElement != NULL) && (uiIndex < castFieldDown()->size)) 
     660    if((pTypedNewElement != NULL) && (uiIndex < castFieldDown()->size())) 
    660661    { 
    661662        typename HandledFieldType::iterator vI = 
    …… 
    668669template <class FieldT> 
    669670inline void 
    670 DynamicEditMFCPointerFieldHandle<FieldT>::replace( 
     671DynamicEditMFCPointerFieldHandle<FieldT>::replaceObject( 
    671672    FieldContainer * const pOldElement, 
    672673    FieldContainer * const pNewElement)