Merge multi-study removal branch.

[modules/smesh.git] / src / SMESH / SMESH_Hypothesis.hxx

diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx
index bfcd2f518daa7b303628e8c246220738c9024c5d..60b74bfb4a80e1405d31d8be3f048fb7bd9a74a2 100644 (file)
--- a/src/SMESH/SMESH_Hypothesis.hxx
+++ b/src/SMESH/SMESH_Hypothesis.hxx
@@ -69,10 +69,9 @@ public:
   static bool IsStatusFatal(Hypothesis_Status theStatus)
   { return theStatus >= HYP_UNKNOWN_FATAL; }
 
   static bool IsStatusFatal(Hypothesis_Status theStatus)
   { return theStatus >= HYP_UNKNOWN_FATAL; }
 

-  SMESH_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
+  SMESH_Hypothesis(int hypId, SMESH_Gen* gen);

   virtual ~SMESH_Hypothesis();
   virtual int GetDim() const;
   virtual ~SMESH_Hypothesis();
   virtual int GetDim() const;

-  int         GetStudyId() const;

   SMESH_Gen*  GetGen() const { return (SMESH_Gen*) _gen; }
   virtual int GetShapeType() const;
   virtual const char* GetLibName() const;
   SMESH_Gen*  GetGen() const { return (SMESH_Gen*) _gen; }
   virtual int GetShapeType() const;
   virtual const char* GetLibName() const;


@@ -126,7 +125,6 @@ public:
 
 protected:
   SMESH_Gen* _gen;
 
 protected:
   SMESH_Gen* _gen;

-  int        _studyId;

   int        _shapeType;
   int        _param_algo_dim; // to be set at descendant hypothesis constructor
 
   int        _shapeType;
   int        _param_algo_dim; // to be set at descendant hypothesis constructor