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 from BR_phase16 branch (09/12/09)
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_HypothesesUtils.h
diff --git
a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
index 89c1335dfa76fb269f09e69468f09036a7139b3a..56a80e43408aa09b21a14338e9557f8646fb1e61 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@
-58,8
+58,6
@@
class algo_error_array;
namespace SMESH
{
namespace SMESH
{
- typedef boost::shared_ptr<SMESHGUI_GenericHypothesisCreator> HypothesisCreatorPtr;
-
SMESHGUI_EXPORT
void InitAvailableHypotheses();
SMESHGUI_EXPORT
void InitAvailableHypotheses();
@@
-67,7
+65,7
@@
namespace SMESH
QStringList GetAvailableHypotheses( const bool,
const int = -1,
const bool = false,
QStringList GetAvailableHypotheses( const bool,
const int = -1,
const bool = false,
- const bool = true);
+
const bool = true);
SMESHGUI_EXPORT
QStringList GetHypothesesSets();
SMESHGUI_EXPORT
QStringList GetHypothesesSets();
@@
-79,15
+77,15
@@
namespace SMESH
SMESHGUI_EXPORT
bool IsAvailableHypothesis( const HypothesisData*,
SMESHGUI_EXPORT
bool IsAvailableHypothesis( const HypothesisData*,
- const QString&,
- bool& );
+
const QString&,
+
bool& );
SMESHGUI_EXPORT
bool IsCompatibleAlgorithm( const HypothesisData*,
SMESHGUI_EXPORT
bool IsCompatibleAlgorithm( const HypothesisData*,
- const HypothesisData* );
+
const HypothesisData* );
SMESHGUI_EXPORT
SMESHGUI_EXPORT
-
HypothesisCreatorPtr
GetHypothesisCreator( const QString& );
+
SMESHGUI_GenericHypothesisCreator*
GetHypothesisCreator( const QString& );
SMESHGUI_EXPORT
SMESH::SMESH_Hypothesis_ptr CreateHypothesis( const QString&,
SMESHGUI_EXPORT
SMESH::SMESH_Hypothesis_ptr CreateHypothesis( const QString&,
@@
-105,7
+103,7
@@
namespace SMESH
SMESHGUI_EXPORT
bool RemoveHypothesisOrAlgorithmOnMesh( _PTR(SObject),
SMESHGUI_EXPORT
bool RemoveHypothesisOrAlgorithmOnMesh( _PTR(SObject),
- SMESH::SMESH_Hypothesis_ptr );
+
SMESH::SMESH_Hypothesis_ptr );
typedef std::vector<_PTR(SObject)> SObjectList;
SObjectList GetMeshesUsingAlgoOrHypothesis( SMESH::SMESH_Hypothesis_ptr );
typedef std::vector<_PTR(SObject)> SObjectList;
SObjectList GetMeshesUsingAlgoOrHypothesis( SMESH::SMESH_Hypothesis_ptr );