X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_Component_i.hxx;h=658294c873eedcadd09da9c22ae70925208f54b5;hb=34bdd08c1cbba32e415e32489d56f91cf89e76da;hp=4315da8b38b6e954f96adc1509b8e134b21bbac6;hpb=e429ce02076e083051c6520e0d7113022bd67b18;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index 4315da8b3..658294c87 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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 @@ -81,7 +81,6 @@ public: void ping(); void destroy(); - CORBA::Long getStudyId(); Engines::Container_ptr GetContainerRef(); void setProperties(const Engines::FieldsDict& dico); @@ -97,8 +96,7 @@ public: bool Resume_impl(); CORBA::Long CpuUsed_impl() ; - virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy, - CORBA::Boolean isPublished, + virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished, CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript); @@ -118,7 +116,7 @@ public: // Object information virtual bool hasObjectInfo() { return false; } - virtual char* getObjectInfo(CORBA::Long studyId, const char* entry) { return CORBA::string_dup(""); } + virtual char* getObjectInfo(const char* entry) { return CORBA::string_dup(""); } // Version information virtual char* getVersion(); @@ -130,8 +128,6 @@ public: std::string getContainerName(); void setContainerName(); - virtual bool setStudyId(CORBA::Long studyId); - static bool isMultiStudy(); static bool isMultiInstance(); static std::string GetDynLibraryName(const char *componentName); @@ -150,8 +146,6 @@ public: Salome_file_i * file); protected: - int _studyId; // -1: not initialised; 0: multiStudy; >0: study - static bool _isMultiStudy; static bool _isMultiInstance; std::string _instanceName ;