X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDSImpl%2FSALOMEDSImpl_ChildIterator.hxx;h=4307e2c6a3a3320c5f10fffea811e21831d39070;hb=7952e7a39ad36b005c6cc3337122325862cec519;hp=507b72f7a1acea3debab613098a21abc30f11e8c;hpb=35960e77d7f9f2a5cac7d6550c23f12943bc4378;p=modules%2Fkernel.git

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx
index 507b72f7a..4307e2c6a 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx
@@ -1,60 +1,58 @@
-// Copyright (C) 2005  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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : SALOMEDSImpl_ChildIterator.hxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
+//
 #ifndef __SALOMEDSImpl_CHILDITERATOR_H__
 #define __SALOMEDSImpl_CHILDITERATOR_H__
 
-//Handle definition
-#include <Handle_MMgt_TShared.hxx>
-#include <Standard_DefineHandle.hxx>
-DEFINE_STANDARD_HANDLE( SALOMEDSImpl_ChildIterator, MMgt_TShared )
-
+#include "SALOMEDSImpl_Defines.hxx"
 #include "SALOMEDSImpl_SObject.hxx"
-#include "TDF_ChildIterator.hxx"
-#include "TDF_Label.hxx"
+#include "DF_ChildIterator.hxx"
+#include "DF_Label.hxx"
 
-class SALOMEDSImpl_ChildIterator: public MMgt_TShared 
+class SALOMEDSIMPL_EXPORT SALOMEDSImpl_ChildIterator
 {
 private:
-  TDF_ChildIterator _it;
-  Handle(SALOMEDSImpl_SObject) _so;
+  DF_ChildIterator _it;
+  SALOMEDSImpl_SObject _so;
 
 public:
 
-  Standard_EXPORT SALOMEDSImpl_ChildIterator(const Handle(SALOMEDSImpl_SObject)& theSO);
-  Standard_EXPORT SALOMEDSImpl_ChildIterator(const TDF_Label& theLabel);
-  Standard_EXPORT ~SALOMEDSImpl_ChildIterator() {};
-
-  Standard_EXPORT virtual void Init();
-  Standard_EXPORT virtual void Init(const TDF_Label& theLabel);
-  Standard_EXPORT virtual void InitEx(bool theAllLevels);
-  Standard_EXPORT virtual void InitEx(const TDF_Label& theLabel, bool theAllLevels);
-  Standard_EXPORT virtual bool More();
-  Standard_EXPORT virtual void Next();
-  Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) Value();
-  Standard_EXPORT virtual TDF_Label Label();
-
-public:
-  DEFINE_STANDARD_RTTI( SALOMEDSImpl_SObject )
+  SALOMEDSImpl_ChildIterator() {}    
+  SALOMEDSImpl_ChildIterator(const SALOMEDSImpl_SObject& theSO);
+  SALOMEDSImpl_ChildIterator(const DF_Label& theLabel);
+  ~SALOMEDSImpl_ChildIterator() {};
+
+  virtual void Init();
+  virtual void Init(const DF_Label& theLabel);
+  virtual void InitEx(bool theAllLevels);
+  virtual void InitEx(const DF_Label& theLabel, bool theAllLevels);
+  virtual bool More();
+  virtual void Next();
+  virtual SALOMEDSImpl_SObject Value();
+  virtual DF_Label Label();
+
+  SALOMEDSImpl_ChildIterator* GetPersistentCopy() const;
 };
 #endif