X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_UseCaseIterator_i.hxx;h=94ccf379dfa6d922c839af2f1a6bf5018ef45856;hb=fad612b29cdd5185fac2428b4fd0c145221ef21f;hp=f936a222fc3c32591ab9b8123b2d226423d55a1b;hpb=102608ce8b69dd1ea798169e30223b67742ec26d;p=modules%2Fkernel.git

diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
index f936a222f..94ccf379d 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
@@ -1,47 +1,32 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
-//
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
-//
-//
-//
 //  File   : SALOMEDS_UseCaseIterator_i.hxx
-//  Author : Yves FRICAUD
+//  Author : Sergey RUIN
 //  Module : SALOME
 
 #ifndef __SALOMEDS_USECASEITERATOR_I_H__
 #define __SALOMEDS_USECASEITERATOR_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
+#include <SALOME_GenericObj_i.hh>
 
+#include "SALOMEDSImpl_UseCaseIterator.hxx"
 
-
-// Cascade headers
-#include <TDF_ChildIterator.hxx>
-#include <TDataStd_ChildNodeIterator.hxx>
-#include <TDataStd_TreeNode.hxx>
-#include <Standard_GUID.hxx>
-#include <stdio.h>
-
-class SALOMEDS_UseCaseIterator_i: public POA_SALOMEDS::UseCaseIterator,
-				public PortableServer::RefCountServantBase {
+class SALOMEDS_UseCaseIterator_i: public virtual POA_SALOMEDS::UseCaseIterator,
+				  public virtual PortableServer::RefCountServantBase, 
+				  public virtual SALOME::GenericObj_i
+{
 private:
-  Standard_GUID                 _guid;
-  Standard_Boolean              _levels;
-  CORBA::ORB_ptr                _orb;
-  Handle(TDataStd_TreeNode)     _node;
-  TDataStd_ChildNodeIterator    _it;
+  CORBA::ORB_ptr                        _orb;
+  Handle(SALOMEDSImpl_UseCaseIterator) _impl;
 
 public:
 
   //! standard constructor  
-  SALOMEDS_UseCaseIterator_i(const TDF_Label& theLabel, 
-			     const Standard_GUID& theGUID, 
-			     const Standard_Boolean allLevels,
+  SALOMEDS_UseCaseIterator_i(const Handle(SALOMEDSImpl_UseCaseIterator)& theImpl, 
 			     CORBA::ORB_ptr);
   
   //! standard destructor