Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.h
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.h
b/src/SMESHGUI/SMESHGUI_Utils.h
index 2f2ff723ab08f29e2d95a3b78b374c8c3b60c2bc..6ff20e8a2fe2c65c7bade362f1ef5b38285555b7 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.h
+++ b/
src/SMESHGUI/SMESHGUI_Utils.h
@@
-80,10
+80,6
@@
SMESHGUI_EXPORT
SMESHGUI_EXPORT
SUIT_ResourceMgr*
GetResourceMgr( const SalomeApp_Module* );
SMESHGUI_EXPORT
SUIT_ResourceMgr*
GetResourceMgr( const SalomeApp_Module* );
-
-SMESHGUI_EXPORT
- _PTR(Study)
- GetCStudy( const SalomeApp_Study* );
SMESHGUI_EXPORT
CORBA::Object_var DataOwnerToObject( const LightApp_DataOwnerPtr& );
SMESHGUI_EXPORT
CORBA::Object_var DataOwnerToObject( const LightApp_DataOwnerPtr& );
@@
-104,7
+100,7
@@
SMESHGUI_EXPORT
SUIT_ViewWindow* GetActiveWindow();
SMESHGUI_EXPORT
SUIT_ViewWindow* GetActiveWindow();
SMESHGUI_EXPORT
- _PTR(Study)
GetActiveStudyDocument
();
+ _PTR(Study)
getStudy
();
SMESHGUI_EXPORT
_PTR(SObject) FindSObject( CORBA::Object_ptr );
SMESHGUI_EXPORT
_PTR(SObject) FindSObject( CORBA::Object_ptr );
@@
-117,10
+113,6
@@
SMESHGUI_EXPORT
void setFileType( _PTR(SObject), const QString& );
void setFileName( _PTR(SObject), const QString& );
void setFileType( _PTR(SObject), const QString& );
void setFileName( _PTR(SObject), const QString& );
-SMESHGUI_EXPORT
- CORBA::Object_var SObjectToObject( _PTR(SObject),
- _PTR(Study) );
-
SMESHGUI_EXPORT
CORBA::Object_var SObjectToObject( _PTR(SObject) );
SMESHGUI_EXPORT
CORBA::Object_var SObjectToObject( _PTR(SObject) );
@@
-166,9
+158,6
@@
SMESHGUI_EXPORT
SMESHGUI_EXPORT
_PTR(SObject) GetMeshOrSubmesh( _PTR(SObject) );
SMESHGUI_EXPORT
_PTR(SObject) GetMeshOrSubmesh( _PTR(SObject) );
-SMESHGUI_EXPORT
- void ModifiedMesh( _PTR(SObject), bool, bool = false );
-
SMESHGUI_EXPORT
void ShowHelpFile( const QString& );
SMESHGUI_EXPORT
void ShowHelpFile( const QString& );
@@
-185,7
+174,7
@@
SMESHGUI_EXPORT
typedef SALOME::GenericObj_wrap<SMESH_IDSource> IDSource_wrap;
/*!
typedef SALOME::GenericObj_wrap<SMESH_IDSource> IDSource_wrap;
/*!
- * \brief Class useful
l
to convert a string returned from a CORBA call
+ * \brief Class useful to convert a string returned from a CORBA call
* to other string types w/o memory leak.
*
* Usage (of instantiations): QString s = toQStr( objVar->GetName() );
* to other string types w/o memory leak.
*
* Usage (of instantiations): QString s = toQStr( objVar->GetName() );