Remove useless files; Use SALOMEDSClient classes instead of CORBA interfaces; fix...

[modules/visu.git] / src / VISUGUI / VisuGUI_Tools.h

diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index 996776bb5cbc3b121914f34700a90a1f4fb735c5..0c2469bfb0789cf2d84682d0e88fecc4f3baf880 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -35,8 +35,6 @@
 #include "SALOMEDSClient_Study.hxx"
 
 #include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include CORBA_SERVER_HEADER(VISU_Gen)
 #include CORBA_SERVER_HEADER(MED_Gen)
 
 class SUIT_Desktop;
@@ -61,7 +59,6 @@ namespace VISU {
   SUIT_Desktop*                        GetDesktop(const CAM_Module* theModule);
   SalomeApp_Study*                     GetAppStudy(const CAM_Module* theModule);
   _PTR(Study)                          GetCStudy(const SalomeApp_Study* theStudy);
-  SALOMEDS::StudyManager_var           GetStudyManager();
 
   bool                                 IsStudyLocked( _PTR(Study) theStudy );
   bool                                 CheckLock( _PTR(Study) theStudy );
@@ -69,9 +66,7 @@ namespace VISU {
   VISU_Gen_i*                          GetVisuGen(const CAM_Module* theModule);
   SALOME_MED::MED_Gen_var              GetMEDEngine();
 
-  VISU::Storable::TRestoringMap        getMapOfValue(SALOMEDS::SObject_var theSObject);
   VISU::Storable::TRestoringMap        getMapOfValue(_PTR(SObject) theSObject);
-  QString                              getValue(SALOMEDS::SObject_var theSObject, QString theKey);
   QString                              getValue(_PTR(SObject) theSObject, QString theKey);
 
   // Selection
@@ -95,8 +90,8 @@ namespace VISU {
                                                CORBA::Object_ptr theObject,
                                                bool theUpdate = true);
   void                                 DeleteSObject(SalomeApp_Module* theModule,
-                                                    SALOMEDS::Study_ptr theStudy,
-                                                    SALOMEDS::SObject_ptr theSObject);
+                                                    _PTR(Study)       theStudy,
+                                                    _PTR(SObject)     theSObject);
   void                                 DeletePrs3d(SalomeApp_Module* theModule,
                                                   VISU::Prs3d_i* thePrs,
                                                   const Handle(SALOME_InteractiveObject)& theIO);
@@ -109,10 +104,10 @@ namespace VISU {
 
   // SObject type
   bool                                 CheckTimeStamp(const SalomeApp_Module* theModule,
-                                                     SALOMEDS::SObject_var& theSObject,
+                                                     _PTR(SObject)&          theSObject,
                                                      Handle(SALOME_InteractiveObject)* theIO = NULL);
   VISU::Result_i*                      CheckResult(const SalomeApp_Module* theModule,
-                                                  SALOMEDS::SObject_var theSource,
+                                                  _PTR(SObject) theSource,
                                                   VISU::Result_var& theResult);
   inline bool                          IsSObjectTable(_PTR(SObject) theSObject);
 
@@ -169,7 +164,7 @@ namespace VISU {
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
                                            const Handle(SALOME_InteractiveObject)& theIO);
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
-                                           SALOMEDS::SObject_ptr theObject);
+                                           _PTR(SObject) theObject);
 }
 
 bool VISU::IsSObjectTable( _PTR(SObject) theSObject )