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
23368: [CEA 1865] Possibility to define faces to mesh as a single one: transpatch...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.h
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.h
b/src/SMESHGUI/SMESHGUI_Utils.h
index d5ec25ed4a7134897d7371269f4a5a69f47d7e8f..2f2ff723ab08f29e2d95a3b78b374c8c3b60c2bc 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.h
+++ b/
src/SMESHGUI/SMESHGUI_Utils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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,7
+182,7
@@
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 usefull to convert a string returned from a CORBA call
/*!
* \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:
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(); }
@@
-204,10
+204,17
@@
SMESHGUI_EXPORT
struct toQStr : public toStrT< QString > {
toQStr( char* s ): toStrT< QString >(s) {}
};
struct toQStr : public toStrT< QString > {
toQStr( char* s ): toStrT< QString >(s) {}
};
-
class
toStdStr : public toStrT< std::string > {
+
struct
toStdStr : public toStrT< std::string > {
toStdStr( char* s ): toStrT< std::string >(s) {}
};
toStdStr( char* s ): toStrT< std::string >(s) {}
};
+ QString fromUtf8( const char* txt );
+ QString fromUtf8( const std::string& 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