X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_ChildIterator_i.hxx;h=e2baa207123ff7890f100c548753c1cb2ef70198;hb=fad612b29cdd5185fac2428b4fd0c145221ef21f;hp=cf9b71ce971bc4315db27423ca37a9c85d7e1ef4;hpb=bd0aa83cc3573de6b62b2a56e168dd372097bd45;p=modules%2Fyacs.git

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
index cf9b71ce9..e2baa2071 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
@@ -1,59 +1,35 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
 //  File   : SALOMEDS_ChildIterator_i.hxx
-//  Author : Yves FRICAUD
+//  Author : Sergey RUIN
 //  Module : SALOME
-//  $Header$
 
 #ifndef __SALOMEDS_CHILDITERATOR_I_H__
 #define __SALOMEDS_CHILDITERATOR_I_H__
 
+// std C++ headers
+#include <iostream>
+
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
+#include <SALOME_GenericObj_i.hh>
 
 // Cascade headers
-#include <TDF_ChildIterator.hxx>
-#include <TDF_Label.hxx>
-
-class SALOMEDS_Study_i;
+#include "SALOMEDSImpl_ChildIterator.hxx"
+#include <stdio.h>
 
-class SALOMEDS_ChildIterator_i: public POA_SALOMEDS::ChildIterator,
-				public PortableServer::RefCountServantBase 
+class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator,
+				public virtual PortableServer::RefCountServantBase,
+				public virtual SALOME::GenericObj_i
 {
-  SALOMEDS_ChildIterator_i(); // Not implemented
-  void operator=(const SALOMEDS_ChildIterator_i&); // Not implemented
-
 private:
-  SALOMEDS_Study_i*        _study;
-  TDF_Label                _lab;
-  TDF_ChildIterator        _it;
-
+  CORBA::ORB_ptr                     _orb;
+  Handle(SALOMEDSImpl_ChildIterator) _it;
 public:
-  SALOMEDS_ChildIterator_i(SALOMEDS_Study_i* theStudy,
-			   const TDF_Label& theLabel);
 
+  //! standard constructor  
+  SALOMEDS_ChildIterator_i(const Handle(SALOMEDSImpl_ChildIterator)&, CORBA::ORB_ptr);
+  
+  //! standard destructor
   ~SALOMEDS_ChildIterator_i();
   
   virtual void Init();
@@ -62,6 +38,4 @@ public:
   virtual void Next();
   virtual SALOMEDS::SObject_ptr Value();
 };
-
-
 #endif