0023299: [CEA] Finalize multi-study removal

- delete study id parameter

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
index 20d122dce29a11081caaea3d92e5e89b974b3085..946cb7e23cb96f746df431edbba7009e500ab5db 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
@@ -62,8 +62,8 @@ static void removeFile( const TCollection_AsciiString& fileName )
 }
 
 //=============================================================================
-GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL(int hypId, int studyId, SMESH_Gen* gen)
-  : SMESH_3D_Algo(hypId, studyId, gen)
+GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL(int hypId, SMESH_Gen* gen)
+  : SMESH_3D_Algo(hypId, gen)
 {
   MESSAGE("GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL");
   _name = "MG-Tetra Parallel";

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
index 5742b5eedd4877e94b81c58aef5977c3320a0a24..bbef999038754e6490e7b70acfac4ec39e0b9d99 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
@@ -37,7 +37,7 @@ class GHS3DPRLPlugin_Hypothesis;
 class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_GHS3DPRL: public SMESH_3D_Algo
 {
 public:
-  GHS3DPRLPlugin_GHS3DPRL(int hypId, int studyId, SMESH_Gen* gen);
+  GHS3DPRLPlugin_GHS3DPRL(int hypId, SMESH_Gen* gen);
   virtual ~GHS3DPRLPlugin_GHS3DPRL();
 
   virtual bool CheckHypothesis(SMESH_Mesh&                          aMesh,

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.cxx
index 02fb2c99e56f9952856ff2cb479c2e8338b5b2e7..ecc596f524761256bc68d9a14defc97248ba94cf 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.cxx
@@ -38,7 +38,6 @@
 //=============================================================================
 
 GHS3DPRLPlugin_GHS3DPRL_i::GHS3DPRLPlugin_GHS3DPRL_i( PortableServer::POA_ptr thePOA,
-                                                     int                     theStudyId,
                                                      ::SMESH_Gen*            theGenImpl )
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA ),
@@ -47,7 +46,6 @@ GHS3DPRLPlugin_GHS3DPRL_i::GHS3DPRLPlugin_GHS3DPRL_i( PortableServer::POA_ptr th
 {
   MESSAGE( "GHS3DPRLPlugin_GHS3DPRL_i::GHS3DPRLPlugin_GHS3DPRL_i" );
   myBaseImpl = new ::GHS3DPRLPlugin_GHS3DPRL( theGenImpl->GetANewId(),
-                                             theStudyId,
                                              theGenImpl );
 }
 

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.hxx
index 9e6caf0b586fc6776b0bb76106e7c498b1c9e786..76932e22f0c1a84a2fab7dabaf78973052d8e768 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.hxx
@@ -44,7 +44,6 @@ class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_GHS3DPRL_i:
 public:
   // Constructor
   GHS3DPRLPlugin_GHS3DPRL_i (PortableServer::POA_ptr thePOA,
-                            int                     theStudyId,
                             ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~GHS3DPRLPlugin_GHS3DPRL_i();

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
index 736de1fe14bfda82e2278ae5f0cf48cf3d45adc7..4d56358dd40414c3374ff77bc35142ca708eec1a 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
@@ -30,8 +30,8 @@
  *
  */
 //=============================================================================
-GHS3DPRLPlugin_Hypothesis::GHS3DPRLPlugin_Hypothesis (int hypId, int studyId, SMESH_Gen * gen)
-  : SMESH_Hypothesis(hypId, studyId, gen),
+GHS3DPRLPlugin_Hypothesis::GHS3DPRLPlugin_Hypothesis (int hypId, SMESH_Gen * gen)
+  : SMESH_Hypothesis(hypId, gen),
     _MEDName( GetDefaultMEDName() ),
     _NbPart( GetDefaultNbPart() ),
     _KeepFiles( GetDefaultKeepFiles() ),

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
index c0cacbe106b6cd7b13a8a4fbfdb6ca5f08040c7c..a1613d57fe070fc240486d5041b2676a9a485362 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
@@ -37,7 +37,7 @@ class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
 
-  GHS3DPRLPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
+  GHS3DPRLPlugin_Hypothesis(int hypId, SMESH_Gen* gen);
 
   static const char* GetHypType() { return "MG-Tetra Parallel Parameters"; }
 

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.cxx
index 68cb74b00d10cf903e90ca173751b3ea248d3a09..5e5b045a9d2e523a0b9933b756ad9d064641e45f 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.cxx
@@ -38,14 +38,12 @@
 //=============================================================================
 GHS3DPRLPlugin_Hypothesis_i::
 GHS3DPRLPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                             int                     theStudyId,
                              ::SMESH_Gen*            theGenImpl)
   : SALOME::GenericObj_i( thePOA ),
     SMESH_Hypothesis_i( thePOA )
 {
   MESSAGE( "GHS3DPRLPlugin_Hypothesis_i::GHS3DPRLPlugin_Hypothesis_i" );
   myBaseImpl = new ::GHS3DPRLPlugin_Hypothesis (theGenImpl->GetANewId(),
-                                                theStudyId,
                                                 theGenImpl);
 }
 

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.hxx
index c10e711c13a3a34427c8a3715fbfbc5f5529761b..630c53d3e15c623bda8016f2d07bf3d0b520490f 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.hxx
@@ -44,7 +44,6 @@ class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_Hypothesis_i:
  public:
   // Constructor
   GHS3DPRLPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
-                               int                     theStudyId,
                                ::SMESH_Gen*            theGenImpl);
   // Destructor
   virtual ~GHS3DPRLPlugin_Hypothesis_i();