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
Restore change of mesh icon depending on its status
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.h
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.h
b/src/SMESHGUI/SMESHGUI_Utils.h
index 5ac9ee97cfbd402878949c76a0e44dede4930078..6ff20e8a2fe2c65c7bade362f1ef5b38285555b7 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
@@
-80,10
+80,6
@@
SMESHGUI_EXPORT
SMESHGUI_EXPORT
SUIT_ResourceMgr*
GetResourceMgr( const SalomeApp_Module* );
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& );
SMESHGUI_EXPORT
CORBA::Object_var DataOwnerToObject( const LightApp_DataOwnerPtr& );
@@
-104,7
+100,7
@@
SMESHGUI_EXPORT
SUIT_ViewWindow* GetActiveWindow();
SMESHGUI_EXPORT
SUIT_ViewWindow* GetActiveWindow();
SMESHGUI_EXPORT
- _PTR(Study)
GetActiveStudyDocument
();
+ _PTR(Study)
getStudy
();
SMESHGUI_EXPORT
_PTR(SObject) FindSObject( CORBA::Object_ptr );
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& );
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) );
SMESHGUI_EXPORT
CORBA::Object_var SObjectToObject( _PTR(SObject) );
@@
-166,9
+158,6
@@
SMESHGUI_EXPORT
SMESHGUI_EXPORT
_PTR(SObject) GetMeshOrSubmesh( _PTR(SObject) );
SMESHGUI_EXPORT
_PTR(SObject) GetMeshOrSubmesh( _PTR(SObject) );
-SMESHGUI_EXPORT
- void ModifiedMesh( _PTR(SObject), bool, bool = false );
-
SMESHGUI_EXPORT
void ShowHelpFile( const QString& );
SMESHGUI_EXPORT
void ShowHelpFile( const QString& );
@@
-182,10
+171,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
+184,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(); }
@@
-208,6
+197,13
@@
SMESHGUI_EXPORT
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