From 38a6cc483e80ead89612d0bbeac21a325ce51389 Mon Sep 17 00:00:00 2001 From: imn Date: Fri, 14 Oct 2016 17:00:46 +0300 Subject: [PATCH] 0023299: [CEA] Finalize multi-study removal - delete study id parameter --- src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx | 4 ++-- src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx | 2 +- src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.cxx | 2 -- src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL_i.hxx | 1 - src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx | 4 ++-- src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx | 2 +- src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.cxx | 2 -- src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis_i.hxx | 1 - 8 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx index 20d122d..946cb7e 100755 --- 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 5742b5e..bbef999 100755 --- 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 02fb2c9..ecc596f 100755 --- 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 9e6caf0..76932e2 100755 --- 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 736de1f..4d56358 100755 --- 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 c0cacbe..a1613d5 100755 --- 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 68cb74b..5e5b045 100755 --- 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 c10e711..630c53d 100755 --- 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(); -- 2.39.2