Merge branch 'BR_1328' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ZLayers.h

diff --git a/src/HYDROGUI/HYDROGUI_ZLayers.h b/src/HYDROGUI/HYDROGUI_ZLayers.h
index 15751cffbab9704d00a34d13204bb912b903ee75..1b3069d9fb2f2361b6a99cdaeae77e228bc71e0a 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ZLayers.h
+++ b/src/HYDROGUI/HYDROGUI_ZLayers.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // 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
@@ -26,16 +22,16 @@
 #include <vector>
 #include <V3d_Viewer.hxx>
 
-class Handle_PrsMgr_PresentableObject;
-class Handle_AIS_InteractiveContext;
+class PrsMgr_PresentableObject;
+class AIS_InteractiveContext;
 
 class HYDROGUI_ZLayersIterator
 {
 public:
-  HYDROGUI_ZLayersIterator( const Handle_V3d_Viewer& );
+  HYDROGUI_ZLayersIterator( const Handle(V3d_Viewer)& );
   ~HYDROGUI_ZLayersIterator();
 
-  void Init( const Handle_V3d_Viewer& );
+  void Init( const Handle(V3d_Viewer)& );
   bool More() const;
   void Next();
   int LayerId() const;
@@ -45,13 +41,13 @@ private:
   std::vector<int>  myZLayers;
   int               myIndex;
   int               myNewZLayer;
-  Handle_V3d_Viewer myViewer;
+  Handle(V3d_Viewer) myViewer;
 };
 
-void SetPrsZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
+void SetPrsZLayer( const Handle(PrsMgr_PresentableObject)& thePresentableObject,
                    const int theMode, const int theLayerId );
-void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle_AIS_InteractiveContext&, int theLayer );
-void SetZLayerSettings( const Handle_V3d_Viewer&, int theLayerId, bool theIsOrdered );
-int  CreateTopZLayer( const Handle_V3d_Viewer& );
+void UpdateZLayersOfHilightPresentationsOfDisplayedObjects( const Handle(AIS_InteractiveContext)&, int theLayer );
+void SetZLayerSettings( const Handle(V3d_Viewer)&, int theLayerId, bool theIsOrdered );
+int  CreateTopZLayer( const Handle(V3d_Viewer)& );
 
 #endif