Merge with version on tag OCC-V2_1_0d

[modules/superv.git] / src / Supervision / Graph_Impl.hxx

diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx
index 66c29baf2e630b403f81c1286031e85e881c2f9a..5f1d8c0230750301a3cca7e9fecfa9d8e21a9744 100644 (file)
--- a/src/Supervision/Graph_Impl.hxx
+++ b/src/Supervision/Graph_Impl.hxx
@@ -80,13 +80,6 @@ class Graph_Impl : public POA_SUPERV::Graph ,
                 const char *interfaceName ,
                 GraphEditor::DataFlow * DataFlowEditor ,
                 GraphEditor::InNode * DataFlowNode ) ;
-    Graph_Impl( CORBA::ORB_ptr orb ,
-               PortableServer::POA_ptr poa ,
-               PortableServer::ObjectId * contId , 
-               const char *instanceName ,
-                const char *interfaceName ,
-                GraphExecutor::DataFlow * DataFlowExecutor ,
-                GraphExecutor::InNode * DataFlowExecutorNode ) ;
     virtual SUPERV::Graph_ptr Copy() ;
 
     virtual ~Graph_Impl() ;
@@ -140,16 +133,16 @@ class Graph_Impl : public POA_SUPERV::Graph ,
                           const SUPERV::ListOfStrings & PythonFunction ,
                           SUPERV::INode_out anEndOfSwitch ) ;
 
-    bool LoadDataFlows( GraphEditor::DataFlow * aDataFlowEditor ,
-                        GraphBase::ListOfSGraphs * aListOfDataFlows ,
-                        int index ) ;
-    bool LoadDataFlows( GraphExecutor::DataFlow * aDataFlowExecutor ,
-                        GraphBase::ListOfSGraphs * aListOfDataFlows ,
-                        int index ) ;
+    SUPERV::Graph_var LoadDataFlows( GraphEditor::DataFlow * aDataFlowEditor ,
+                                     GraphBase::ListOfSGraphs * aListOfDataFlows ,
+                                     int index ) ;
+    SUPERV::Graph_var LoadDataFlows( GraphExecutor::DataFlow * aDataFlowExecutor ,
+                                     GraphBase::ListOfSGraphs * aListOfDataFlows ,
+                                     int index ) ;
     virtual SUPERV::Graph_ptr MNode( const char * aXmlFileName ) ;
 
     virtual SUPERV::Graph_ptr MNode( GraphEditor::DataFlow * aDataFlowEditor ,
-                                     GraphBase::ListOfSGraphs aListOfDataFlows ) ;
+                                     GraphBase::ListOfSGraphs * aListOfDataFlows ) ;
 
     virtual SUPERV::Graph_ptr GraphMNode( SUPERV::Graph_ptr aGraph ) ;