Merge V9_dev branch into master

[modules/kernel.git] / src / SALOMEDSClient / SALOMEDSClient_ClientFactory.hxx

diff --git a/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx b/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
index 59df14ea57e708b1ad0509bacf59b9641e378861..6293ce2941aa57cb0a6561ff8a8b1a073eb7f4c6 100644 (file)
--- a/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
+++ b/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
@@ -32,7 +32,6 @@
 #include "SALOMEDSClient_SObject.hxx"
 #include "SALOMEDSClient_SComponent.hxx"
 #include "SALOMEDSClient_Study.hxx"
-#include "SALOMEDSClient_StudyManager.hxx"
 #include "SALOMEDSClient_IParameters.hxx"
 
 #include <string>
@@ -60,19 +59,14 @@ public:
   static _PTR(Study) Study(SALOMEDS::Study_ptr theStudy);
 
   /*!
-   *  Returns a client StudyBuilder wrapper that corresponds %theStudy
-   */
-  static _PTR(StudyBuilder) StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuilder);
-
-  /*!
-   *  Returns a client StudyManager wrapper
+   *  Creates and returns a client Study wrapper
    */
-  static _PTR(StudyManager) StudyManager();
+  static void createStudy(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /*!
-   *  Creates and returns a client StudyManager wrapper
+   *  Returns a client StudyBuilder wrapper that corresponds %theStudy
    */
-  static _PTR(StudyManager) createStudyManager(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
+  static _PTR(StudyBuilder) StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuilder);
 
   /*!
    * Returns an IParameters interface
@@ -85,11 +79,6 @@ public:
    */
   static SALOMEDS::SObject_ptr crbSObject(const _PTR(SObject)& theSObject);
 
-  /*!
-   *  Returns a CORBA Study that corresponds %theStudy
-   */
-  static SALOMEDS::Study_ptr crbStudy(const _PTR(Study)& theStudy);  
-
   /*!
    *  Returns a CORBA StudyBuilder that corresponds %theStudyBuilder
    */