Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing cmake3.12 dependancy problem on // compilation
[modules/kernel.git]
/
src
/
SALOMEDSClient
/
SALOMEDSClient_ClientFactory.hxx
diff --git
a/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
b/src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
index 0382b2c31fa396961c26bf2158358c1f2beb564b..6293ce2941aa57cb0a6561ff8a8b1a073eb7f4c6 100644
(file)
--- a/
src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
+++ b/
src/SALOMEDSClient/SALOMEDSClient_ClientFactory.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-32,7
+32,6
@@
#include "SALOMEDSClient_SObject.hxx"
#include "SALOMEDSClient_SComponent.hxx"
#include "SALOMEDSClient_Study.hxx"
#include "SALOMEDSClient_SObject.hxx"
#include "SALOMEDSClient_SComponent.hxx"
#include "SALOMEDSClient_Study.hxx"
-#include "SALOMEDSClient_StudyManager.hxx"
#include "SALOMEDSClient_IParameters.hxx"
#include <string>
#include "SALOMEDSClient_IParameters.hxx"
#include <string>
@@
-60,19
+59,14
@@
public:
static _PTR(Study) Study(SALOMEDS::Study_ptr theStudy);
/*!
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(Study
Manager) createStudyManager(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa
);
+ static _PTR(Study
Builder) StudyBuilder(SALOMEDS::StudyBuilder_ptr theBuilder
);
/*!
* Returns an IParameters interface
/*!
* Returns an IParameters interface
@@
-85,11
+79,6
@@
public:
*/
static SALOMEDS::SObject_ptr crbSObject(const _PTR(SObject)& theSObject);
*/
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
*/
/*!
* Returns a CORBA StudyBuilder that corresponds %theStudyBuilder
*/