From c89685475f4bbdae4aadc4ea74d14e8c54469046 Mon Sep 17 00:00:00 2001 From: asl Date: Wed, 5 Apr 2006 06:32:19 +0000 Subject: [PATCH] partially rollback of previous fix --- src/SUIT/SUIT_TreeSync.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h index b39b539ae..1dee6066a 100644 --- a/src/SUIT/SUIT_TreeSync.h +++ b/src/SUIT/SUIT_TreeSync.h @@ -74,12 +74,12 @@ TrgItem synchronize( const SrcItem& r1, const TrgItem& r2, const TreeData& td ) } } } - + return r2; } else { - TrgItem new_r2 = createSubTree( r1, td.parent( r2 ), r2, r2==td.nullTrg(), td ); + TrgItem new_r2 = createSubTree( r1, td.parent( r2 ), r2, false, td ); if( r2!=td.nullTrg() ) td.deleteItemWithChildren( r2 ); return new_r2; @@ -104,8 +104,8 @@ void diffSiblings( const SrcItem& src, const TrgItem& trg, QValueList < DiffItem < SrcItem,TrgItem > >& d, const TreeData& td ) { - if( src==td.nullSrc() || trg==td.nullTrg() ) - return; + //if( src==td.nullSrc() || trg==td.nullTrg() ) + // return; QValueList src_ch; QValueList trg_ch; -- 2.39.2