Updated SALOME GUI sources for building under Ms Visual .NET on Windows platform.

diff --git a/src/SalomeApp/SalomeApp_DataModel.cxx b/src/SalomeApp/SalomeApp_DataModel.cxx
index 5fcae7b7b2651a3cdfa44c522d8205d5499347cc..3b11eb66954bb5d6e69a80906a0592c05d62cbbb 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.cxx
+++ b/src/SalomeApp/SalomeApp_DataModel.cxx
@@ -20,11 +20,11 @@
 #include <SUIT_TreeSync.h>
 #include <SUIT_DataObjectIterator.h>
 
-#include "SALOMEDS_Tool.hxx"
-
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
+#include "SALOMEDS_Tool.hxx"
+
 //=======================================================================
 // name    : SalomeApp_DataModelSync
 /*!Purpose : Auxiliary class for synchronizing tree of kernel objects and SUIT_DataObjects  */
@@ -64,7 +64,7 @@ SalomeApp_DataModelSync::SalomeApp_DataModelSync( _PTR( Study ) aStudy, SUIT_Dat
 bool SalomeApp_DataModelSync::isCorrect( const kerPtr& so ) const
 {
   kerPtr refObj;
-  QString name = so->GetName();
+  QString name( so->GetName().c_str() );
   bool res = so && ( so->GetName().size() || so->ReferencedObject( refObj ) );
   return res;
 }
@@ -116,7 +116,7 @@ void SalomeApp_DataModelSync::deleteItemWithChildren( const suitPtr& p ) const
 bool SalomeApp_DataModelSync::isEqual( const kerPtr& p, const suitPtr& q ) const
 {
   LightApp_DataObject* obj = dynamic_cast<LightApp_DataObject*>( q );
-  return ( !p && !q ) || ( obj && isCorrect( p ) && p->GetID()==obj->entry() );
+  return ( !p && !q ) || ( obj && isCorrect( p ) && QString( p->GetID().c_str() ) == obj->entry() );
 }
 
 kerPtr SalomeApp_DataModelSync::nullSrc() const

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index f3de086605ec8967f99fd10910cd16004f4c8833..6b72dd880034fb755eb61926fb776c253b5f793d 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -33,14 +33,15 @@
 #include <qptrlist.h>
 
 #include "utilities.h"
-#include "string.h"
-#include "vector.h"
 
-#include "SALOMEDS_Tool.hxx"
+#include <string>
+#include <vector>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
+#include "SALOMEDS_Tool.hxx"
+
 /*!
   Constructor.
 */