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 branch 'master' into pre/penta18
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.h
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.h
b/src/SMESHGUI/SMESHGUI_Utils.h
index c1aa3ad4dc57eef3fb351793de1a40f45b26f9c0..5b2e0b89ba662fb1caa7aa102767b8e7f04a880c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.h
+++ b/
src/SMESHGUI/SMESHGUI_Utils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-182,10
+182,10
@@
SMESHGUI_EXPORT
// type to use instead of SMESH_IDSource_var for automatic UnRegister()
// type to use instead of SMESH_IDSource_var for automatic UnRegister()
- typedef SALOME::GenericObj_wrap<SMESH_IDSource>
SMESH_
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() );
@@
-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