X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Utils.h;h=6ff20e8a2fe2c65c7bade362f1ef5b38285555b7;hp=a15fada9f7f88c60c6e830d5a08c3cbebd9dd32a;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=6c4a9f32ed7b4416d79e0d0d293919609a8eb178

diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h
index a15fada9f..6ff20e8a2 100644
--- a/src/SMESHGUI/SMESHGUI_Utils.h
+++ b/src/SMESHGUI/SMESHGUI_Utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -80,10 +80,6 @@ SMESHGUI_EXPORT
 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& );
@@ -104,7 +100,7 @@ SMESHGUI_EXPORT
   SUIT_ViewWindow* GetActiveWindow();
 
 SMESHGUI_EXPORT
-  _PTR(Study) GetActiveStudyDocument();
+  _PTR(Study) getStudy();
 
 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& );
 
-SMESHGUI_EXPORT
-  CORBA::Object_var SObjectToObject( _PTR(SObject),
-                                     _PTR(Study) );
-
 SMESHGUI_EXPORT
   CORBA::Object_var SObjectToObject( _PTR(SObject) );
 
@@ -166,9 +158,6 @@ SMESHGUI_EXPORT
 SMESHGUI_EXPORT
   _PTR(SObject) GetMeshOrSubmesh( _PTR(SObject) );
 
-SMESHGUI_EXPORT
-  void ModifiedMesh( _PTR(SObject), bool, bool = false );
-
 SMESHGUI_EXPORT
   void ShowHelpFile( const QString& );
 
@@ -185,7 +174,7 @@ SMESHGUI_EXPORT
   typedef SALOME::GenericObj_wrap<SMESH_IDSource> IDSource_wrap;
 
   /*!
-   * \brief Class usefull 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() );
@@ -195,7 +184,7 @@ SMESHGUI_EXPORT
   class toStrT : public _STRING {
     CORBA::String_var myStr;
   public:
-    toStrT( char* s ): myStr(s), _STRING( s )
+    toStrT( char* s ): _STRING( s ), myStr(s)
     {}
     operator const char*() const
     { return myStr.in(); }
@@ -210,7 +199,11 @@ SMESHGUI_EXPORT
 
   QString fromUtf8( const char* txt );
   QString fromUtf8( const std::string& txt );
-  const char* toUtf8( const QString& txt );
+  struct toUtf8: public std::string
+  {
+    toUtf8( const QString& txt );
+    operator const char*() const { return c_str(); }
+  };
 }
 
 #endif // SMESHGUI_UTILS_H