X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Utils.h;h=6f024242ff497c850a79224551b766bff0efc3db;hb=7a65c9fad427b1ccba6b9ccae612296e5092a324;hp=c1aa3ad4dc57eef3fb351793de1a40f45b26f9c0;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h index c1aa3ad4d..6f024242f 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.h +++ b/src/SMESHGUI/SMESHGUI_Utils.h @@ -182,7 +182,7 @@ SMESHGUI_EXPORT // type to use instead of SMESH_IDSource_var for automatic UnRegister() - typedef SALOME::GenericObj_wrap SMESH_IDSource_wrap; + typedef SALOME::GenericObj_wrap IDSource_wrap; /*! * \brief Class usefull to convert a string returned from a CORBA call @@ -195,7 +195,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 +210,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