X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDSImpl%2FSALOMEDSImpl_StudyHandle.hxx;h=fa8f069e0fb4a00058e23228c8086f4759031082;hb=a7a1147d4b4b217c5eee783f67e6748610d4a614;hp=e74cac4146e214fec4a7318d18387fc2fbeb3bbd;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx
index e74cac414..fa8f069e0 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyHandle.hxx
@@ -1,73 +1,64 @@
-// 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-2010  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/ or email : webmaster.salome@opencascade.com
+//  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_StudyHandle.hxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
+//
 #ifndef SALOMEDSImpl_StudyHandle_HeaderFile
 #define SALOMEDSImpl_StudyHandle_HeaderFile
 
-#include <Standard_DefineHandle.hxx>
-#include <TDF_Attribute.hxx>
-#include <TDF_Label.hxx>
-
-class Standard_GUID;
-class Handle(TDF_Attribute);
-class Handle(TDF_RelocationTable);
+#include "SALOMEDSImpl_Defines.hxx"
+#include "DF_Attribute.hxx"
+#include "DF_Label.hxx"
 
 /*
-  Class       : SALOMEDSImpl_StudyHandle
-  Description : PRIVATE: This class is intended for storing of the study handle 
+Class       : SALOMEDSImpl_StudyHandle
+Description : PRIVATE: This class is intended for storing of the study handle 
 */
 
-DEFINE_STANDARD_HANDLE( SALOMEDSImpl_StudyHandle, TDF_Attribute )
-
 #include "SALOMEDSImpl_Study.hxx"
 
-#ifndef WNT
-class Standard_EXPORT SALOMEDSImpl_StudyHandle : public TDF_Attribute
-#else
-class SALOMEDSImpl_StudyHandle : public TDF_Attribute
-#endif
+class SALOMEDSIMPL_EXPORT SALOMEDSImpl_StudyHandle :
+  public DF_Attribute
 {
 
 public:
-Standard_EXPORT                                  SALOMEDSImpl_StudyHandle();
-Standard_EXPORT                                  ~SALOMEDSImpl_StudyHandle() { myHandle.Nullify(); }
+  SALOMEDSImpl_StudyHandle();
+  ~SALOMEDSImpl_StudyHandle() {; }
 
-Standard_EXPORT  static Handle(SALOMEDSImpl_StudyHandle) Set(const TDF_Label& theLabel, const Handle(SALOMEDSImpl_Study)& theStudy); 
-Standard_EXPORT  static const                    Standard_GUID& GetID() ;
+  static SALOMEDSImpl_StudyHandle* Set(const DF_Label& theLabel, SALOMEDSImpl_Study* theStudy); 
+  static const                    std::string& GetID() ;
+
+  void                            Set(SALOMEDSImpl_Study* theStudy) { myHandle = theStudy; }
+  SALOMEDSImpl_Study*             Get() { return myHandle; }
+  const std::string&              ID() const;
+  void                            Restore( DF_Attribute* theWith );
+  DF_Attribute*                   NewEmpty() const;
+  void                            Paste( DF_Attribute* theInto);
 
-Standard_EXPORT  void                            SetHandle(const Handle(SALOMEDSImpl_Study)& theStudy) { myHandle = theStudy; }
-Standard_EXPORT  Handle(SALOMEDSImpl_Study)      GetHandle() { return myHandle; }
-Standard_EXPORT  const Standard_GUID&            ID() const;
-Standard_EXPORT  void                            Restore( const Handle(TDF_Attribute)& theWith );
-Standard_EXPORT  Handle(TDF_Attribute)           NewEmpty() const;
-Standard_EXPORT  void                            Paste( const Handle(TDF_Attribute)& theInto,
-							                            const Handle(TDF_RelocationTable)& ) const;
-  
 private:
-  Handle(SALOMEDSImpl_Study) myHandle;
+  SALOMEDSImpl_Study* myHandle;
 
-public:
-  DEFINE_STANDARD_RTTI( SALOMEDSImpl_StudyHandle )
 };
 
 #endif