Merge branch 'V9_2_2_BR'

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI_SalomeTools.hxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 69bb330..a8b4763
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  CEA/DEN, 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
@@ -25,9 +25,8 @@
 #include <SalomeApp_Application.h>
 #include <SALOME_Actor.h>
 #include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <Handle_AIS_InteractiveObject.hxx>
-#include <Handle_AIS_InteractiveContext.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <AIS_InteractiveContext.hxx>
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 #include <SALOME_Actor.h>
 #include <SVTK_ViewWindow.h>
@@ -42,7 +41,7 @@ namespace HEXABLOCK
   {
 
 HEXABLOCK_EXPORT  SALOME_Actor* findActorByEntry( SVTK_ViewWindow *theVtkViewWindow, const char* theEntry );
-  _PTR(Study)   GetActiveStudyDocument();
+  _PTR(Study)   getStudy();
 
 HEXABLOCK_EXPORT int GetNameOfSelectedElements( SVTK_ViewWindow *theWindow,/* SVTK_Selector* theSelector,*/
                                  const Handle(SALOME_InteractiveObject)& theIO,