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 master
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.h
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.h
b/src/SMESHGUI/SMESHGUI_Utils.h
index a15fada9f7f88c60c6e830d5a08c3cbebd9dd32a..6f024242ff497c850a79224551b766bff0efc3db 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.h
+++ b/
src/SMESHGUI/SMESHGUI_Utils.h
@@
-195,7
+195,7
@@
SMESHGUI_EXPORT
class toStrT : public _STRING {
CORBA::String_var myStr;
public:
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(); }
{}
operator const char*() const
{ return myStr.in(); }
@@
-210,7
+210,11
@@
SMESHGUI_EXPORT
QString fromUtf8( const char* txt );
QString fromUtf8( const std::string& txt );
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
}
#endif // SMESHGUI_UTILS_H