Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Utils.h

diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h
index 15009ab9540167f0d7361434d8ab86768e7cee77..d236533fea2d6cd03041cf9c464c2f3a723bd3b2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Utils.h
+++ b/src/SMESHGUI/SMESHGUI_Utils.h
@@ -24,13 +24,14 @@
 
 #include "SALOMEDSClient_definitions.hxx"
 #include "SALOME_InteractiveObject.hxx"
-#include "SalomeApp_DataOwner.h"
+#include "LightApp_DataOwner.h"
 
 class QString;
 
 class SUIT_ViewWindow;
 class SUIT_Desktop;
 class SUIT_Study;
+class SUIT_ResourceMgr;
 
 class CAM_Module;
 
@@ -39,26 +40,29 @@ class SALOMEDSClient_SObject;
 
 class SalomeApp_Study;
 class SalomeApp_Module;
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 
 namespace SMESH {
 
   SUIT_Desktop*
   GetDesktop(const CAM_Module* theModule);
 
-  SalomeApp_SelectionMgr*
+  LightApp_SelectionMgr*
   GetSelectionMgr(const SalomeApp_Module* theModule);
 
   SalomeApp_Study*
   GetAppStudy(const CAM_Module* theModule);
 
+  SUIT_ResourceMgr*
+  GetResourceMgr( const SalomeApp_Module* );
+  
   _PTR(Study)
   GetCStudy(const SalomeApp_Study* theStudy);
 
-  CORBA::Object_var DataOwnerToObject(const SalomeApp_DataOwnerPtr& theOwner);
+  CORBA::Object_var DataOwnerToObject(const LightApp_DataOwnerPtr& theOwner);
 
   template<class TInterface> typename TInterface::_var_type
-    DataOwnerToInterface(const SalomeApp_DataOwnerPtr& theDataOwner)
+    DataOwnerToInterface(const LightApp_DataOwnerPtr& theDataOwner)
     {
       CORBA::Object_var anObj = DataOwnerToObject(theDataOwner);
       if(!CORBA::is_nil(anObj))
@@ -77,6 +81,8 @@ namespace SMESH {
 
   void SetName  (_PTR(SObject) theSObject, const char* theName);
   void SetValue (_PTR(SObject) theSObject, const char* theValue);
+  void setFileType (_PTR(SObject) theSObject, const char* theValue);
+  void setFileName (_PTR(SObject) theSObject, const char* theValue);
 
   CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject,
                                     _PTR(Study) theStudy);
@@ -114,7 +120,7 @@ namespace SMESH {
       return TInterface::_nil();
     }
 
-  int GetNameOfSelectedIObjects (SalomeApp_SelectionMgr*, QString& theName);
+  int GetNameOfSelectedIObjects (LightApp_SelectionMgr*, QString& theName);
 
   _PTR(SObject) GetMeshOrSubmesh (_PTR(SObject) theSObject);