From: asv <asv@opencascade.com>
Date: Tue, 7 Mar 2006 09:30:44 +0000 (+0000)
Subject: DataObject - cout is replaces with printf
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a8a101f3ae91ab6ab29700603d51b4e6f38f33b9;p=modules%2Fgui.git

DataObject - cout is replaces with printf
TreeSync - bug with update of object itself (not only its children) is fixed.
---

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index afc3446f3..ddb393817 100755
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -22,8 +22,6 @@
 
 #include "SUIT_DataObjectKey.h"
 
-#include <iostream> // for cout in dump()
-
 /*!
     Constructor
 */
@@ -491,7 +489,7 @@ SUIT_DataObjectKey* SUIT_DataObject::key() const
 void SUIT_DataObject::dump( const int indent ) const
 {
   QString strIndent = QString().fill( ' ', indent ); // indentation string 
-  std::cout << strIndent << name() << std::endl;     // dump to cout
+  printf( "%s%s\n", strIndent.latin1(), name().latin1() );
   for ( DataObjectListIterator it( myChildren ); it.current(); ++it ) // iterate all children
     it.current()->dump( indent + 2 );  // dump every child with indent + 2 spaces
 }
diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h
index d38f6fcdf..19bdf4edd 100644
--- a/src/SUIT/SUIT_TreeSync.h
+++ b/src/SUIT/SUIT_TreeSync.h
@@ -38,10 +38,12 @@ const typename QValueList<TrgItem>::const_iterator findEqual( const QValueList<T
 template <class SrcItem, class TrgItem, class TreeData>
 TrgItem synchronize( const SrcItem& r1, const TrgItem& r2, const TreeData& td )
 {
-  //  printf( "--- synchronize : %d ---\n", ++gSync );
-
   if( td.isEqual( r1, r2 ) )
   {
+    // update items themselves
+    td.updateItem( r2 );
+
+    // iterate 'siblings' (direct children) 
     QValueList< DiffItem< SrcItem, TrgItem > > d;
     diffSiblings( r1, r2, d, td );