Join modifications from branch OCC_development_for_3_2_0a2

[modules/gui.git] / src / SalomeApp / SalomeApp_DataModel.h

diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 62e649bc36ad4abd1213390716e5a89e688d9836..7452cd366c19abe5ef371687a57ea87bb8b501f9 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.h
@@ -27,10 +27,9 @@ class SALOMEAPP_EXPORT SalomeApp_DataModel : public LightApp_DataModel
 
 public:
   static SUIT_DataObject*             synchronize( const _PTR( SComponent )&, SalomeApp_Study* );
-  static SUIT_DataObject*             synchronize( const _PTR( SObject )&, SUIT_DataObject*, SalomeApp_Study* );
 
-                                      SalomeApp_DataModel ( CAM_Module* theModule );
-  virtual                             ~SalomeApp_DataModel();
+  SalomeApp_DataModel ( CAM_Module* theModule );
+  virtual ~SalomeApp_DataModel();
 
   virtual bool                        open( const QString&, CAM_Study*, QStringList );
   virtual bool                        create( CAM_Study* );